svn commit: r1747305 - in /uima/sandbox/uima-ducc/trunk: src/main/admin/ducc.py src/main/admin/ducc_util.py uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java

[cwiklik]

Author: cwiklik
Date: Tue Jun  7 19:15:02 2016
New Revision: 1747305

URL: http://svn.apache.org/viewvc?rev=1747305&view=rev
Log:
UIMA-4555 removed xstream from ducc. Instead uses xstream from uima-as activemq

Modified:
    uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
    uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
    
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py?rev=1747305&r1=1747304&r2=1747305&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py Tue Jun  7 19:15:02 2016
@@ -210,8 +210,8 @@ class Ducc(DuccUtil):
                 os.chdir(self.DUCC_HOME + '/webserver')
                 if ( self.ws_jvm_args != None ):
                     jvm_opts.append(self.ws_jvm_args)
-
-                self.add_to_classpath(ducc_home + '/lib/http-client/*')
+                self.add_to_classpath(ducc_home + 
'/apache-uima/apache-activemq/lib/optional/*')
+#                self.add_to_classpath(ducc_home + '/lib/http-client/*')
                 self.add_to_classpath(ducc_home + '/webserver/lib/*')
                 self.add_to_classpath(ducc_home + '/webserver/lib/jsp/*')
                 self.prepend_classpath(ducc_home + '/lib/cassandra/*')       
@@ -221,7 +221,8 @@ class Ducc(DuccUtil):
                     args = '-' + or_parms
                 if ( self.or_jvm_args != None ):
                     jvm_opts.append(self.or_jvm_args)
-                self.add_to_classpath(ducc_home + '/lib/http-client/*')
+                self.add_to_classpath(ducc_home + 
'/apache-uima/apache-activemq/lib/optional/*')
+#                self.add_to_classpath(ducc_home + '/lib/http-client/*')
                 self.add_to_classpath(ducc_home + '/webserver/lib/*')       
                 self.prepend_classpath(ducc_home + '/lib/cassandra/*')       
 
@@ -233,7 +234,7 @@ class Ducc(DuccUtil):
                 if ( self.sm_jvm_args != None ):
                     jvm_opts.append(self.sm_jvm_args)
                 self.add_to_classpath(ducc_home + 
'/apache-uima/apache-activemq/lib/optional/*')
-                self.add_to_classpath(ducc_home + '/lib/http-client/*')
+#                self.add_to_classpath(ducc_home + '/lib/http-client/*')
                 self.add_to_classpath(ducc_home + '/webserver/lib/*')       
                 self.prepend_classpath(ducc_home + '/lib/cassandra/*')       
 

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=1747305&r1=1747304&r2=1747305&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 Tue Jun  7 
19:15:02 2016
@@ -376,6 +376,7 @@ class DuccUtil(DuccBase):
 
         CLASSPATH = CLASSPATH + ':' + DH  + 'apache-uima/lib/*'           
         CLASSPATH = CLASSPATH + ':' + DH  + 
'apache-uima/apache-activemq/lib/*'           
+        CLASSPATH = CLASSPATH + ':' + DH  + 
'apache-uima/apache-activemq/lib/optional/*'           
         CLASSPATH = CLASSPATH + ':' + LIB + 'apache-commons/*'
         CLASSPATH = CLASSPATH + ':' + LIB + 'guava/*'
         CLASSPATH = CLASSPATH + ':' + LIB + 'google-gson/*'

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java?rev=1747305&r1=1747304&r2=1747305&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/DuccEventHttpDispatcherCl.java
 Tue Jun  7 19:15:02 2016
@@ -41,7 +41,8 @@ public class DuccEventHttpDispatcherCl
     private ClassManager classManager = null;
 
     String[] classpath = {
-        "lib/apache-camel/xstream*",
+//            "lib/apache-camel/xstream*",
+        "apache-uima/apache-activemq/lib/optional/xstream*",
         "lib/google-gson/gson*",
     };