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 2014/05/29 01:00:49 UTC
svn commit: r1598168 - in /uima/sandbox/uima-ducc/trunk/src/main:
assembly/bin.xml resources/jobclasspath.properties
Author: burn
Date: Wed May 28 23:00:49 2014
New Revision: 1598168
URL: http://svn.apache.org/r1598168
Log:
UIMA-3733 Drop lib/apache-activemq from assembly. Add optional activemq jars to JP classpaths for http service brokers
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties
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=1598168&r1=1598167&r2=1598168&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Wed May 28 23:00:49 2014
@@ -129,21 +129,6 @@ under the License.
<directoryMode>755</directoryMode>
</dependencySet>
- <!-- HTTP Support For DUCC Services -->
- <dependencySet>
- <includes>
- <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
- <include>xpp3:xpp3</include>
- <include>org.apache.httpcomponents:httpclient</include>
- <include>org.apache.httpcomponents:httpcore</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <outputDirectory>lib/apache-activemq</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
<!-- UIMA-AS -->
<!-- dependencySet>
<useStrictFiltering>true</useStrictFiltering>
@@ -283,25 +268,6 @@ under the License.
<directoryMode>755</directoryMode>
</dependencySet>
- <dependencySet>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.activemq:activemq-camel</include>
- <include>org.apache.activemq:activemq-pool</include>
- <include>org.apache.activemq:activemq-jaas</include>
- <include>commons-pool:commons-pool</include>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>xpp3:xpp3</include>
- </includes>
- <outputDirectory>lib/apache-activemq</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
<!--dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
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=1598168&r1=1598167&r2=1598168&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/jobclasspath.properties Wed May 28 23:00:49 2014
@@ -44,6 +44,7 @@ ducc.jobprocess.classpath = \
${DUCC_HOME}/apache-uima/lib/*:\
${DUCC_HOME}/lib/apache-log4j/*:\
${DUCC_HOME}/apache-uima/apache-activemq/lib/*:\
+ ${DUCC_HOME}/apache-uima/apache-activemq/lib/optional/*:\
${DUCC_HOME}/lib/apache-camel/*:\
${DUCC_HOME}/lib/http-client/*:\
${DUCC_HOME}/lib/slf4j/*:\