You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/11/27 21:43:11 UTC
svn commit: r1546188 - in /uima/sandbox/uima-ducc/trunk:
src/main/admin/ducc_util.py src/main/assembly/bin.xml
uima-ducc-parent/pom.xml
Author: cwiklik
Date: Wed Nov 27 20:43:11 2013
New Revision: 1546188
URL: http://svn.apache.org/r1546188
Log:
UIMA-3452 Updated to add version numbers to ducc jars. Copied ducc jars to lib/uima-ducc folder. Updated py script to use wildcard when add ducc jars to CP
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1546188&r1=1546187&r2=1546188&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Wed Nov 27 20:43:11 2013
@@ -255,16 +255,7 @@ class DuccUtil(DuccBase):
# explicitly NOT ducc_test.jar
CLASSPATH = CLASSPATH + ':' + ducc_home + '/webserver/lib/*'
CLASSPATH = CLASSPATH + ':' + ducc_home + '/webserver/lib/jsp/*'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-agent.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-cli.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-common.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-transport.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-jd.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-orchestrator.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-pm.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-rm.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-sm.jar'
- CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-web.jar'
+ CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc/*'
CLASSPATH = CLASSPATH + ':' + RESOURCES
@@ -599,23 +590,26 @@ class DuccUtil(DuccBase):
#
# Print the version information from the DUCC jars
+ #
+
#
- for j in [\
- 'uima-ducc-rm.jar',\
- 'uima-ducc-pm.jar', \
- 'uima-ducc-orchestrator.jar', \
- 'uima-ducc-sm.jar', \
- 'uima-ducc-web.jar', \
- 'uima-ducc-cli.jar', \
- 'uima-ducc-agent.jar', \
- 'uima-ducc-common.jar', \
- 'uima-ducc-jd.jar',
- ]:
-
-
- manifest = DuccProperties()
- manifest.load_from_manifest(self.DUCC_HOME + '/lib/' + j)
- response.append('ENV: %25s %18s %12s %s' % (j + ':', manifest.get('Ducc-Version'), 'compiled at', manifest.get('Build-Date')))
+ #version = manifest.get
+ #for j in [\
+ # 'uima-ducc-rm.jar',\
+ # 'uima-ducc-pm.jar', \
+ # 'uima-ducc-orchestrator.jar', \
+ # 'uima-ducc-sm.jar', \
+ # 'uima-ducc-web.jar', \
+ # 'uima-ducc-cli.jar', \
+ # 'uima-ducc-agent.jar', \
+ # 'uima-ducc-common.jar', \
+ # 'uima-ducc-jd.jar',
+ # ]:
+
+
+# manifest = DuccProperties()
+# manifest.load_from_manifest(self.DUCC_HOME + '/lib/' + j)
+# response.append('ENV: %25s %18s %12s %s' % (j + ':', manifest.get('Ducc-Version'), 'compiled at', manifest.get('Build-Date')))
return response
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=1546188&r1=1546187&r2=1546188&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Wed Nov 27 20:43:11 2013
@@ -83,7 +83,7 @@ under the License.
<include>org.apache.uima:uima-ducc-web</include>
<include>org.apache.uima:uima-ducc-examples</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
+ <outputFileNameMapping>uima-ducc/${artifact.artifactId}-${project.version}.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
@@ -704,12 +704,7 @@ under the License.
<fileMode>644</fileMode>
</file>
- <file>
- <!-- put compiled samples into right place in bin tarball -->
- <source>uima-ducc-examples/target/uima-ducc-examples.jar</source>
- <outputDirectory>examples/lib</outputDirectory>
- <fileMode>644</fileMode>
- </file>
+
</files>
</assembly>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1546188&r1=1546187&r2=1546188&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Wed Nov 27 20:43:11 2013
@@ -200,7 +200,7 @@
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>libpam4j</artifactId>
@@ -844,7 +844,7 @@
<build>
- <finalName>${project.artifactId}</finalName>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<pluginManagement>
<plugins>
<!-- Prereq Java 6 because of lib dependencies -->