Skip to content

Commit

Permalink
Manual merge of master
Browse files Browse the repository at this point in the history
  • Loading branch information
@rayder441
rayder441 authored and Stanford NLP committed Sep 13, 2013
1 parent aaf73cc commit 0c8b6ba
Show file tree
Hide file tree
Showing 204 changed files with 39,216 additions and 35,347 deletions.
298 changes: 240 additions & 58 deletions JavaNLP-core.iml
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,244 @@
<?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>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar:https://$MODULE_DIR$/lib/ant-contrib-1.0b3.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/el-api.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/jasper.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/servlet-api.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/tomcat-juli.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/jasper-el.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/jsp-api.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/tomcat/tomcat-api.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/commons-logging.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/junit.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/javax.servlet.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/AppleJavaExtensions.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/JFlex.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/xom-1.2.8.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/joda-time.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/jollyday-0.4.7.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/log4j-1.2.16.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/ejml-0.19-nogui.jar!/" />
<libelement value="jar:https://$MODULE_DIR$/lib/commons-lang3-3.1.jar!/" />
<src_description expected_position="0">
<src_folder value="file:https://$MODULE_DIR$/itest/src" expected_position="0" />
<src_folder value="file:https://$MODULE_DIR$/src" expected_position="1" />
<src_folder value="file:https://$MODULE_DIR$/test/src" expected_position="2" />
</src_description>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file:https://$MODULE_DIR$/classes" />
<exclude-output />
<content url="file:https://$MODULE_DIR$">
<sourceFolder url="file:https://$MODULE_DIR$/itest/src" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/test/src" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library name="ant-contrib-1.0b3.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/ant-contrib-1.0b3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/ant-contrib-1.0b3-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="el-api.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/el-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="jasper.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/jasper.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="servlet-api.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="tomcat-juli.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/tomcat-juli.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="jasper-el.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/jasper-el.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="jsp-api.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/jsp-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="tomcat-api.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/tomcat/tomcat-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/tomcat/apache-tomcat-7.0.12-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="commons-logging.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/commons-logging-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="junit.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/junit-4.5-src.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="javax.servlet.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/javax.servlet.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="AppleJavaExtensions.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/AppleJavaExtensions.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="JFlex.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/JFlex.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/jflex-1.4.3-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="xom-1.2.8.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/xom-1.2.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/xom-src-1.2.8.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="joda-time.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/joda-time.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/joda-time-2.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="jollyday-0.4.7.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/jollyday-0.4.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/jollyday-0.4.7-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library" exported="">
<library name="log4j-1.2.16.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/log4j-1.2.16.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/log4j-1.2.16-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="ejml-0.19-nogui.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/ejml-0.19-nogui.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="commons-lang3-3.1.jar">
<CLASSES>
<root url="jar:https://$MODULE_DIR$/lib/commons-lang3-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:https://$MODULE_DIR$/libsrc/commons-lang3-3.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>

23 changes: 22 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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., -->
Expand Down
1 change: 0 additions & 1 deletion commonbuildjsp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading

0 comments on commit 0c8b6ba

Please sign in to comment.