You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/03/04 22:54:13 UTC
svn commit: r1452550 - in /uima/sandbox/uima-ducc/trunk: src/main/admin/
src/main/assembly/ uima-ducc-cli/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
Author: challngr
Date: Mon Mar 4 21:54:12 2013
New Revision: 1452550
URL: http://svn.apache.org/r1452550
Log:
UIMA-2702
Adjust classpaths, assembly, etc. Minor adjustments to code to eliminate
references to unused functions as a result of the base changes in 2702.
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-cli/build_manifest.py
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
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=1452550&r1=1452549&r2=1452550&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 Mon Mar 4 21:54:12 2013
@@ -410,6 +410,42 @@ class DuccUtil:
os.environ['CLASSPATH'] = CLASSPATH
+ def set_classpath_for_cli(self):
+ # This is only needed if you use the API, not the executable jars. The executable
+ # jars pull in everything needed.
+ ducc_home = self.DUCC_HOME
+ LIB = ducc_home + '/lib'
+ RESOURCES = ducc_home + '/resources'
+
+ local_jars = self.ducc_properties.get('ducc.local.jars') #local mods
+
+ CLASSPATH = ''
+
+ if ( local_jars != None ):
+ extra_jars = local_jars.split()
+ for j in extra_jars:
+ CLASSPATH = CLASSPATH + ':' + LIB + '/' + j
+
+ CLASSPATH = CLASSPATH + ":" + LIB + '/slf4j/*'
+ CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons-cli/*'
+ CLASSPATH = CLASSPATH + ":" + LIB + '/google-gson/*'
+ CLASSPATH = CLASSPATH + ":" + LIB + '/apache-log4j/*'
+ CLASSPATH = CLASSPATH + ":" + LIB + '/xstream/*'
+ CLASSPATH = CLASSPATH + ":" + LIB + '/uima/*'
+
+ # orchestrator http needs codecs
+ CLASSPATH = CLASSPATH + ":" + LIB + '/http-client/*'
+
+ # explicitly NOT ducc_test.jar
+ CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-cli.jar'
+ CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-common.jar'
+ CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc-transport.jar'
+
+ CLASSPATH = CLASSPATH + ':' + RESOURCES
+
+ os.environ['CLASSPATH'] = CLASSPATH
+
+
def format_classpath(self, cp):
strings = cp.split(':')
for s in strings:
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=1452550&r1=1452549&r2=1452550&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Mon Mar 4 21:54:12 2013
@@ -21,7 +21,6 @@ under the License.
<id>bin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>apache-uima-ducc-${project.version}</baseDirectory>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/build_manifest.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/build_manifest.py?rev=1452550&r1=1452549&r2=1452550&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/build_manifest.py (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/build_manifest.py Mon Mar 4 21:54:12 2013
@@ -15,25 +15,10 @@ def main():
"slf4j/jcl-over-slf4j.jar",
"slf4j/slf4j-api.jar",
"slf4j/slf4j-log4j12.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-camel/xstream-${xstream.version}.jar",
- "apache-camel/mina-core-${mina.core.version}.jar",
- "apache-camel/camel-context-${org.apache.camel.version}.jar",
- "apache-camel/camel-core-${org.apache.camel.version}.jar",
- "apache-camel/camel-http-${org.apache.camel.version}.jar",
- "apache-camel/camel-http4-${org.apache.camel.version}.jar",
- "apache-camel/camel-jetty-${org.apache.camel.version}.jar",
- "apache-camel/camel-jms-${org.apache.camel.version}.jar",
- "apache-camel/camel-mina-${org.apache.camel.version}.jar",
- "apache-camel/camel-servlet-${org.apache.camel.version}.jar",
- "apache-camel/camel-spring-${org.apache.camel.version}.jar",
- "apache-camel/camel-stream-${org.apache.camel.version}.jar",
- "apache-camel/camel-test-${org.apache.camel.version}.jar",
- "apache-camel/camel-test-spring-${org.apache.camel.version}.jar",
- "apache-camel/camel-xmlbeans-${org.apache.camel.version}.jar",
- "apache-camel/camel-xstream-${org.apache.camel.version}.jar",
"apache-log4j/log4j-${log4j.version}.jar",
"apache-commons-cli/commons-cli-${commons.cli.version}.jar",
"uima/uimaj-core-${org.apache.uima.version}.jar",
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=1452550&r1=1452549&r2=1452550&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Mon Mar 4 21:54:12 2013
@@ -22,7 +22,7 @@
<properties>
<DUCC_CP>
-uima-ducc-cli.jar uima-ducc-common.jar uima-ducc-transport.jar ../resources/ slf4j/jcl-over-slf4j.jar slf4j/slf4j-api.jar slf4j/slf4j-log4j12.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-camel/xstream-${xstream.version}.jar apache-camel/mina-core-${mina.core.version}.jar apache-camel/camel-context-${org.apache.camel.version}.jar apache-camel/camel-core-${org.apache.camel.version}.jar apache-camel/camel-http-${org.apache.camel.version}.jar apache-camel/camel-http4-${org.apache.camel.version}.jar apache-camel/camel-jetty-${org.apache.camel.version}.jar apache-camel/camel-jms-${org.apache.camel.version}.jar apache-camel/camel-mina-${org.apache.camel.version}.jar apache-camel/camel-servlet-${org.apache.camel.version}.jar apache-camel/camel-spring-${org.apache.camel.version}.jar apache-camel/camel-stream-${org.apache.camel.version}.jar apache-camel/ca
mel-test-${org.apache.camel.version}.jar apache-camel/camel-test-spring-${org.apache.camel.version}.jar apache-camel/camel-xmlbeans-${org.apache.camel.version}.jar apache-camel/camel-xstream-${org.apache.camel.version}.jar apache-log4j/log4j-${log4j.version}.jar apache-commons-cli/commons-cli-${commons.cli.version}.jar uima/uimaj-core-${org.apache.uima.version}.jar uima/uimaj-as-core-${org.apache.uima.as.version}.jar
+uima-ducc-cli.jar uima-ducc-common.jar uima-ducc-transport.jar ../resources/ slf4j/jcl-over-slf4j.jar slf4j/slf4j-api.jar slf4j/slf4j-log4j12.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/uimaj-core-${org.apache.uima.version}.jar uima/uimaj-as-core-${org.apache.uima.as.version}.jar
</DUCC_CP>
</properties>
@@ -52,17 +52,17 @@ uima-ducc-cli.jar uima-ducc-common.jar u
<configuration>
<archive>
- <index>true</index>
+ <!-- index>true</index -->
<manifest>
<addClasspath>false</addClasspath>
</manifest>
<manifestEntries>
+y <class-path>${DUCC_CP}</class-path>
<Ducc-Version>${project.version}</Ducc-Version>
<Ducc-OS-Id>${os.name} ${os.arch} ${os.version}</Ducc-OS-Id>
<Ducc-Bassedir>${basedir}</Ducc-Bassedir>
<Ducc-Java-Vendor>${java.vendor}</Ducc-Java-Vendor>
<Project-Title>Apache UIMA DUCC</Project-Title>
- <class-path>${DUCC_CP}</class-path>
</manifestEntries>
</archive>
</configuration>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1452550&r1=1452549&r2=1452550&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Mon Mar 4 21:54:12 2013
@@ -79,7 +79,7 @@ public class DuccServiceApi
boolean debug = false;
- CamelContext context = null;
+ // CamelContext context = null;
static boolean init_done = false;
@@ -448,16 +448,16 @@ public class DuccServiceApi
init_done = true;
}
- synchronized protected DuccEventDispatcher connect() throws Exception
- {
- context = new DefaultCamelContext();
-
- //ActiveMQComponent amqc = ActiveMQComponent.activeMQComponent(broker);
- //context.addComponent(jms_provider, amqc);
- //context.start();
- DuccEventDispatcher duccEventDispatcher = new DuccEventDispatcher(context, endpoint);
- return duccEventDispatcher;
- }
+ // synchronized protected DuccEventDispatcher connect() throws Exception
+ // {
+ // context = new DefaultCamelContext();
+
+ // //ActiveMQComponent amqc = ActiveMQComponent.activeMQComponent(broker);
+ // //context.addComponent(jms_provider, amqc);
+ // //context.start();
+ // DuccEventDispatcher duccEventDispatcher = new DuccEventDispatcher(context, endpoint);
+ // return duccEventDispatcher;
+ // }
private Pair<Integer, String> getId(CommandLine cl, ServiceVerb verb)
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1452550&r1=1452549&r2=1452550&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Mon Mar 4 21:54:12 2013
@@ -151,7 +151,7 @@ public class ServiceSet
job_props.put("service_ping_timeout", ""+ServiceManagerComponent.meta_ping_timeout);
job_props.put("working_directory", System.getProperty("user.dir")); // whatever my current dir is
job_props.put("log_directory", System.getProperty("user.dir") + "/../logs");
- job_props.put("service_ping_jvm_args", "-Xmx50M");
+ //job_props.put("service_ping_jvm_args", "-Xmx50M");
props_filename = state_dir + "/services/" + id.toString() + ".svc";
saveServiceProperties();
@@ -227,7 +227,7 @@ public class ServiceSet
if ( ! job_props.containsKey("service_ping_dolog")) {
job_props.put("service_ping_dolog", "false");
}
- job_props.put("service_ping_jvm_args", "-Xmx50M");
+ // job_props.put("service_ping_jvm_args", "-Xmx0M");
}
}