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/03 19:53:05 UTC
svn commit: r1547526 - in /uima/sandbox/uima-ducc/trunk: src/main/assembly/
uima-ducc-cli/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/
uima-ducc-examples/src/main/resources/sleepjobs/
Author: burn
Date: Tue Dec 3 18:53:05 2013
New Revision: 1547526
URL: http://svn.apache.org/r1547526
Log:
UIMA-3452 Build unversioned cli jar under lib as before. Remove relative references from the the example jobs.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
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=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Tue Dec 3 18:53:05 2013
@@ -440,8 +440,17 @@ under the License.
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
-
-
+
+ <!-- Unversioned CLI jar -->
+ <fileSet>
+ <directory>uima-ducc-cli/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ <includes>
+ <include>uima-ducc-cli.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
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=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Tue Dec 3 18:53:05 2013
@@ -28,6 +28,11 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../uima-ducc-parent/pom.xml</relativePath>
</parent>
+
+ <!-- Inherits groupid and version from the parent pom project coordinates -->
+ <!-- Uses default packaging ie. jar -->
+ <artifactId>uima-ducc-cli</artifactId>
+
<!-- Special inheritance note even though the <scm> element that follows
is exactly the same as those in super poms, it cannot be inherited because
there is some special code that computes the connection elements from the
@@ -49,12 +54,11 @@
<DUCC_CP>
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>
+ <DUCC_CP2>
+uima-ducc/uima-ducc-cli-${ducc.version}.jar uima-ducc/uima-ducc-common-${ducc.version}.jar uima-ducc/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_CP2>
</properties>
- <!-- Inherits groupid and version from the parent pom project coordinates -->
- <!-- Uses default packaging ie. jar -->
- <artifactId>uima-ducc-cli</artifactId>
-
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
@@ -91,16 +95,37 @@ uima-ducc-common-${ducc.version}.jar uim
</archive>
</configuration>
-
<executions>
+ <!-- Create a manifest-only jar that will be placed up one level under <ducc-home>/lib -->
<execution>
- <id>${project.artifactId}</id>
+ <id>DuccCli</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
- <!-- Name the jar -->
<finalName>${project.artifactId}</finalName>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <class-path>${DUCC_CP2}</class-path>
+ </manifestEntries>
+ </archive>
+ <excludes>
+ <exclude>**/</exclude>
+ <exclude>META-INF/maven/*</exclude>
+ <exclude>**/pom.*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <!-- Build the cli jar last so it is the one installed in the repository !! -->
+ <execution>
+ <id>${project.artifactId}</id>
+ <goals><goal>jar</goal></goals>
+ <phase>package</phase>
+ <configuration>
<archive>
</archive>
</configuration>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java?rev=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java Tue Dec 3 18:53:05 2013
@@ -385,8 +385,7 @@ public class Utils {
String n = "/" + cl.getName().replaceAll("\\.", "/")+".class"; // to for /org/apache/uima ... Utils.class
- // Assuming you've installed DUCC into /home/whatever/ducc_runtime
- // URL will be of form jar:file:/home/whatever/ducc_runtime/lib/uima-ducc-common.jar!/org/apache/uima/ducc/common/utils/Utils.class
+ // URL will be of form jar:file:<ducc-home>/lib/uima-ducc/uima-ducc-common-<version>.jar!/org/apache/uima/ducc/common/utils/Utils.class
URL res = cl.getResource(n);
if ( res == null ) {
throw new IllegalArgumentException("Cannot find or infer DUCC_HOME.");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job?rev=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job Tue Dec 3 18:53:05 2013
@@ -18,9 +18,9 @@
#
description Test DD Job 1
-classpath ../lib/uima-ducc-examples.jar
+classpath ${DUCC_HOME}/lib/uima-ducc/examples/*
driver_descriptor_CR org.apache.uima.ducc.test.randomsleep.FixedSleepCR
-driver_descriptor_CR_overrides jobfile=1.inputs compression=10 error_rate=0.0
+driver_descriptor_CR_overrides jobfile=${DUCC_HOME}/lib/examples/simple/1.inputs compression=10 error_rate=0.0
driver_jvm_args -Xmx500M
process_DD org.apache.uima.ducc.test.ddjob.DDSleepDescriptor
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job?rev=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job Tue Dec 3 18:53:05 2013
@@ -19,12 +19,12 @@
description Test job 1
driver_descriptor_CR org.apache.uima.ducc.test.randomsleep.FixedSleepCR
-driver_descriptor_CR_overrides jobfile=1.inputs compression=10 error_rate=0.0
+driver_descriptor_CR_overrides jobfile=${DUCC_HOME}/lib/examples/simple/1.inputs compression=10 error_rate=0.0
driver_jvm_args -Xmx500M
process_descriptor_AE org.apache.uima.ducc.test.randomsleep.FixedSleepAE
process_memory_size 2
-classpath ../lib/uima-ducc-examples.jar
+classpath ${DUCC_HOME}/lib/uima-ducc/examples/*
process_jvm_args -Xmx100M
process_thread_count 2
process_per_item_time_max 5
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job?rev=1547526&r1=1547525&r2=1547526&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job Tue Dec 3 18:53:05 2013
@@ -19,12 +19,12 @@
description Test job 2
driver_descriptor_CR org.apache.uima.ducc.test.randomsleep.FixedSleepCR
-driver_descriptor_CR_overrides jobfile=2.inputs compression=1 error_rate=0.0
+driver_descriptor_CR_overrides jobfile=${DUCC_HOME}/lib/examples/simple/2.inputs compression=1 error_rate=0.0
driver_jvm_args -Xmx500M
process_descriptor_AE org.apache.uima.ducc.test.randomsleep.FixedSleepAE
process_memory_size 2
-classpath ../lib/uima-ducc-examples.jar
+classpath ${DUCC_HOME}/lib/uima-ducc/examples/*
process_jvm_args -Xmx16G
process_thread_count 2
process_per_item_time_max 5