You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/03/06 17:36:18 UTC
svn commit: r634336 - in
/incubator/uima/sandbox/trunk/uima-as/uima-as-distr: pom.xml
src/main/assembly/bin.xml src/main/scripts/setUimaClassPath.bat
Author: schor
Date: Thu Mar 6 08:36:13 2008
New Revision: 634336
URL: http://svn.apache.org/viewvc?rev=634336&view=rev
Log:
[UIMA-839] Fix setclasspath script - missing % in the bat version. Fix javadoc generation. Fix script build to put in right setUimaClassPath, and merge uima-as examples into the examples dir.
Modified:
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml?rev=634336&r1=634335&r2=634336&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml Thu Mar 6 08:36:13 2008
@@ -300,12 +300,13 @@
<packages>*</packages>
</group>
</groups>
+ <!--verbose>true</verbose-->
<sourcepath>
../uimaj-as-core/src/main/java
</sourcepath>
- <!-- *.aae makes javadoc fail -->
+ <subpackages>org.apache.uima.aae</subpackages>
<excludePackageNames>
- org.apache.uima.aae:
+ *.uima.aae:
*.aae.controller:
*.aae.deploymentDescriptor:
*.aae.error:
@@ -322,6 +323,8 @@
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsynchronousEngine.java
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaEEStatusCallbackListener.java
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResult.java
+ ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultComponentPath.java
+ ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultTDs.java
</additionalparam>
<doctitle>Apache UIMA Async Scaleout Java SDK ${pom.version} User-Level API Documentation</doctitle>
<windowtitle>Apache UIMA-AS Java SDK ${pom.version} User-Level API Documentation</windowtitle>
@@ -371,14 +374,14 @@
<ant dir="../uima-as-docbooks" inheritAll="false"/>
<!-- build eclipse update site -->
- <!--ant dir="../uimaj-eclipse-update-site"-->
+ <ant dir="../uimaj-eclipse-update-site">
<!-- property values from maven must be passed in
using what looks like a redundant <property> statement.
See http://cwiki.apache.org/UIMA/maven-tips.html
section on passing parameters to ant scripts -->
- <!--property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>
+ <property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>
<property name="project.version" value="${uimaj-release-eclipse-version}"/>
- </ant-->
+ </ant>
</tasks>
</configuration>
<goals>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml?rev=634336&r1=634335&r2=634336&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml Thu Mar 6 08:36:13 2008
@@ -123,22 +123,7 @@
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- <!--dependencySet>
- <includes>
- <include>org.apache.uima:uimaj-as-core</include>
- </includes>
- <outputFileNameMapping>uimaj-as-core.jar</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:uimaj-as-jms</include>
- </includes>
- <outputFileNameMapping>uimaj-as-jms.jar</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet-->
+
<!-- UIMA-AS included other projects -->
@@ -198,6 +183,9 @@
<!-- base UIMA -->
<fileSet>
<directory>../uimaj-distr/src/main/scripts</directory>
+ <excludes>
+ <exclude>setUimaClassPath.*</exclude>
+ </excludes>
<outputDirectory>bin</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
@@ -303,30 +291,37 @@
<directory>../uimaj-examples/src/main/run_configuration</directory>
<outputDirectory>examples/run_configuration</outputDirectory>
</fileSet>
+
+ <!-- uima-as additions -->
+ <fileSet>
+ <directory>src/main/examples</directory>
+ <outputDirectory>examples</outputDirectory>
+ </fileSet>
</fileSets>
+
<files>
<file>
<source>../uimaj-examples/src/main/eclipseProject/project</source>
<outputDirectory>examples</outputDirectory>
<destName>.project</destName>
- <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+ <fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/eclipseProject/classpath</source>
<outputDirectory>examples</outputDirectory>
<destName>.classpath</destName>
- <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+ <fileMode>644</fileMode>
</file>
<file>
<source> ../uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</source>
<outputDirectory>examples/ecore_src</outputDirectory>
<destName>readme.txt</destName>
- <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+ <fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</source>
<outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
- <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+ <fileMode>644</fileMode>
</file>
</files>
</assembly>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat?rev=634336&r1=634335&r2=634336&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat Thu Mar 6 08:36:13 2008
@@ -22,32 +22,32 @@
@set _REALLYNOQUOTES=%_NOQUOTES:"=%
@if "%_REALLYNOQUOTES%"=="=" set _REALLYNOQUOTES=
@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\examples\resources;%UIMA_HOME%\lib\uima-core.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\uima-document-annotation.jar;%UIMA_HOME%\lib\uima-cpe.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\uima-tools.jar;%UIMA_HOME%\lib\uima-examples.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\uima-adapter-soap.jar;%UIMA_HOME%\lib\uima-adapter-vinci.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\activation.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\axis.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-discovery.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-discovery-0.2.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-logging.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-logging-1.0.4.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\jaxrpc.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\mail.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\saaj.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\jVinci.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\apache-activemq.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\activemq-optional.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\commons-httpclient.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\xstream.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\xmlpull.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\jetty.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\jetty-util.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\optional\servlet-api-2.5.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\commons-logging.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\commons-pool.jar;%UIMA_HOME%\lib\spring.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\uimaj-as-core.jar;%UIMA_HOME%\lib\uima-as-activemq.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\lib\uimaj-as-jms.jar
-@set UIMA_CLASSPATH=%UIMA_CLASSPATH;%UIMA_HOME%\config;%_REALLYNOQUOTES%
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\uima-document-annotation.jar;%UIMA_HOME%\lib\uima-cpe.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\uima-tools.jar;%UIMA_HOME%\lib\uima-examples.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\uima-adapter-soap.jar;%UIMA_HOME%\lib\uima-adapter-vinci.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\activation.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\axis.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-discovery.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-discovery-0.2.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-logging.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\commons-logging-1.0.4.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\jaxrpc.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\mail.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib\saaj.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\jVinci.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\apache-activemq.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\activemq-optional.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\commons-httpclient.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\xstream.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\xmlpull.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\jetty.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\jetty-util.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\optional\servlet-api-2.5.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\commons-logging.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\commons-pool.jar;%UIMA_HOME%\lib\spring.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\uimaj-as-core.jar;%UIMA_HOME%\lib\uima-as-activemq.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib\uimaj-as-jms.jar
+@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\config;%_REALLYNOQUOTES%
@rem set path to support running C++ annotators
set PATH=%UIMA_HOME%\uimacpp\bin;%UIMA_HOME%\uimacpp\examples\tutorial\src;%PATH%
@rem Also set VNS_HOST and VNS_PORT to default values if they are not specified