You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/12/02 22:34:54 UTC
svn commit: r1547198 - in /uima/sandbox/uima-ducc/trunk:
src/main/assembly/bin.xml src/main/resources/jobclasspath.properties
uima-ducc-cli/pom.xml
Author: burn
Date: Mon Dec 2 21:34:54 2013
New Revision: 1547198
URL: http://svn.apache.org/r1547198
Log:
UIMA-3452 Put versioned uima-ducc/ jars in the CLI's manifest classpath
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1547198&r1=1547197&r2=1547198&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Mon Dec 2 21:34:54 2013
@@ -83,13 +83,13 @@ under the License.
<include>org.apache.uima:uima-ducc-web</include>
<include>org.apache.uima:uima-ducc-examples</include>
</includes>
- <outputFileNameMapping>uima-ducc/${artifact.artifactId}-${project.version}.jar</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${project.version}.jar</outputFileNameMapping>
+ <outputDirectory>lib/uima-ducc</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
-
+
<!-- Google GSon -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
@@ -441,19 +441,6 @@ under the License.
</fileSet>
<fileSet>
- <directory>uima-ducc-cli/target</directory>
- <outputDirectory>lib</outputDirectory>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>uima-ducc-cli.jar</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
<directory>src/main/config</directory>
<outputDirectory>resources</outputDirectory>
<fileMode>644</fileMode>
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties?rev=1547198&r1=1547197&r2=1547198&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties Mon Dec 2 21:34:54 2013
@@ -23,7 +23,7 @@
# May have to be modified if any of the jars in DUCC_HOME/lib are changed.
# ========================================================================
-#ducc.reload.file = if set file is reloaded on every job
+ducc.reload.file = if set file is reloaded on every job
ducc.jobdriver.classpath = \
${DUCC_HOME}/lib/uima-ducc-jd.jar:\
@@ -49,7 +49,5 @@ ducc.jobprocess.classpath = \
${DUCC_HOME}/lib/apache-activemq/*:\
${DUCC_HOME}/lib/apache-camel/*:\
${DUCC_HOME}/lib/springframework/*:\
- ${DUCC_HOME}/lib/xstream/*
-
-
-
+ ${DUCC_HOME}/lib/xstream/*:\
+ ${DUCC_HOME}/resources
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml?rev=1547198&r1=1547197&r2=1547198&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Mon Dec 2 21:34:54 2013
@@ -47,7 +47,7 @@
<properties>
<DUCC_CP>
-uima-ducc-common.jar uima-ducc-transport.jar ../resources/ springframework/jcl-over-slf4j-1.5.11.jar springframework/slf4j-api-1.5.11.jar springframework/slf4j-log4j12-1.5.11.jar xstream/xstream.jar http-client/commons-codec-${commons.codec.version}.jar http-client/commons-httpclient-${commons.httpclient.version}.jar google-gson/gson-${google.gson.version}.jar apache-log4j/log4j-${log4j.version}.jar apache-commons-cli/commons-cli-${commons.cli.version}.jar uima/uima-core.jar uima/uimaj-as-core.jar
+uima-ducc-common-${ducc.version}.jar uima-ducc-transport-${ducc.version}.jar ../../resources/ ../springframework/jcl-over-slf4j-1.5.11.jar ../springframework/slf4j-api-1.5.11.jar ../springframework/slf4j-log4j12-1.5.11.jar ../xstream/xstream.jar ../http-client/commons-codec-${commons.codec.version}.jar ../http-client/commons-httpclient-${commons.httpclient.version}.jar ../google-gson/gson-${google.gson.version}.jar ../apache-log4j/log4j-${log4j.version}.jar ../apache-commons-cli/commons-cli-${commons.cli.version}.jar ../uima/uima-core.jar ../uima/uimaj-as-core.jar
</DUCC_CP>
</properties>