Make it so NP-ADV nodes are npadvmod

stanfordnlp · Jun 11, 2014 · 07355d5 · 07355d5
1 parent b30ed06
commit 07355d5
Show file tree

Hide file tree

Showing 264 changed files with 41,148 additions and 31,974 deletions.
diff --git a/JavaNLP-core.eml b/JavaNLP-core.eml
@@ -1,15 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component LANGUAGE_LEVEL="JDK_1_6" inheritJdk="true">
- <output-test url="file:https://$MODULE_DIR$/classes"/>
+<component inheritJdk="true">
  <exclude-output/>
- <contentEntry url="file:https://$MODULE_DIR$">
- <testFolder url="file:https://$MODULE_DIR$/test/src"/>
- </contentEntry>
+ <contentEntry url="file:https://$MODULE_DIR$"/>
  <lib name="ant-contrib-1.0b3.jar" scope="COMPILE">
  <srcroot url="jar:https://$MODULE_DIR$/libsrc/ant-contrib-1.0b3-src.zip!/"/>
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ant-contrib-1.0b3-src.zip!/"/>
  <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/ant-contrib-1.0b3.jar!/"/>
  </lib>
+ <lib name="el-api.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/el-api.jar!/"/>
+ </lib>
+ <lib name="jasper.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/jasper.jar!/"/>
+ </lib>
+ <lib name="servlet-api.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/servlet-api.jar!/"/>
+ </lib>
+ <lib name="tomcat-juli.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/tomcat-juli.jar!/"/>
+ </lib>
+ <lib name="jasper-el.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/jasper-el.jar!/"/>
+ </lib>
+ <lib name="jsp-api.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/jsp-api.jar!/"/>
+ </lib>
+ <lib name="tomcat-api.jar" scope="COMPILE">
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/"/>
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/tomcat/tomcat-api.jar!/"/>
+ </lib>
  <lib name="commons-logging.jar" scope="COMPILE">
  <srcroot url="jar:https://$MODULE_DIR$/libsrc/commons-logging-1.1.1-sources.jar!/"/>
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/commons-logging-1.1.1-sources.jar!/"/>
@@ -20,6 +52,9 @@
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/junit-4.5-src.jar!/"/>
  <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/junit.jar!/"/>
  </lib>
+ <lib name="javax.servlet.jar" scope="COMPILE">
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/javax.servlet.jar!/"/>
+ </lib>
  <lib name="AppleJavaExtensions.jar" scope="COMPILE">
  <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/AppleJavaExtensions.jar!/"/>
  </lib>
@@ -51,16 +86,28 @@
  <lib name="ejml-0.19-nogui.jar" scope="COMPILE">
  <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/src"/>
  <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/test"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/examples/src"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/examples/test"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/benchmarks/src"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/benchmarks/test"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/experimental/src"/>
+ <srcroot url="jar:https://$MODULE_DIR$/libsrc/ejml-0.19-src.zip!/ejml/experimental/test"/>
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/src"/>
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/test"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/examples/src"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/examples/test"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/benchmarks/src"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/benchmarks/test"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/experimental/src"/>
+ <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/ejml-0.19-src.zip!/ejml/experimental/test"/>
  <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/ejml-0.19-nogui.jar!/"/>
  </lib>
  <lib name="commons-lang3-3.1.jar" scope="COMPILE">
  <srcroot url="jar:https://$MODULE_DIR$/libsrc/commons-lang3-3.1-sources.jar!/"/>
  <relative-module-src project-related="jar:https://$PROJECT_DIR$/projects/core/libsrc/commons-lang3-3.1-sources.jar!/"/>
  <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/commons-lang3-3.1.jar!/"/>
  </lib>
- <lib name="servlet-api.jar" scope="COMPILE">
- <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/servlet-api.jar!/"/>
+ <lib name="javacc.jar" scope="COMPILE">
+ <relative-module-cls project-related="jar:https://$PROJECT_DIR$/projects/core/lib/javacc.jar!/"/>
  </lib>
 </component>
diff --git a/JavaNLP-core.iml b/JavaNLP-core.iml
@@ -1,62 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/parser/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/parser/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file:https://$MODULE_DIR$/itest/src" />
- <root url="file:https://$MODULE_DIR$/src" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="web" name="Web2">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/time/suservlet/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/time/suservlet" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file:https://$MODULE_DIR$/itest/src" />
- <root url="file:https://$MODULE_DIR$/src" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="web" name="Web3">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/ie/ner/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/ie/ner/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file:https://$MODULE_DIR$/itest/src" />
- <root url="file:https://$MODULE_DIR$/src" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="web" name="Web4">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/pipeline/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file:https://$MODULE_DIR$/src/edu/stanford/nlp/pipeline/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file:https://$MODULE_DIR$/itest/src" />
- <root url="file:https://$MODULE_DIR$/src" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
-</module>
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
 
diff --git a/build.xml b/build.xml
@@ -34,6 +34,27 @@
  <delete dir="${build.path}"/>
  </target>
 
+ <target name="javacceverything" depends="classpath"
+ description="javacc everything that can be javacced">
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${project.core}/lib/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
+ <echo message="${ant.project.name}" />
+ <for param="javacc.target">
+ <path>
+ <fileset dir="${source.path}">
+ <include name="**/*.jj"/>
+ </fileset>
+ </path>
+ <sequential>
+ <javacc target="@{javacc.target}" javacchome="${basedir}/lib" />
+ </sequential>
+ </for>
+ </target>
+
  <target name="flexeverything" depends="classpath"
  description="JFlex everything that can be JFlexed">
  <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -147,7 +168,7 @@
  description="Clean and re-compile." />
 
  <!-- This file contains the .jsp build target -->
- <import file="../../commonbuildjsp.xml" />
+ <import file="commonbuildjsp.xml" />
 
  <!-- This runs the specified class, using a separate Java VM -->
  <!-- Specify class to run via "run.class," arg, i.e., -->

diff --git a/commonbuildjsp.xml b/commonbuildjsp.xml
@@ -9,7 +9,6 @@
  </fileset>
  <pathelement location="${build.path}"/>
  <pathelement location="${project.core}/lib/commons-logging.jar"/>
- <pathelement location="${project.core}/lib/javax.servlet.jar"/>
  </path>
 
  <target name="jsp" depends="classpath,compile">