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 2014/05/13 18:26:26 UTC
svn commit: r1594268 - 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: Tue May 13 16:26:25 2014
New Revision: 1594268
URL: http://svn.apache.org/r1594268
Log:
UIMA-3733 Refactored to include http support in ducc broker, added uima and uima-as runtime
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=1594268&r1=1594267&r2=1594268&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 May 13 16:26:25 2014
@@ -254,10 +254,14 @@ class DuccUtil(DuccBase):
CLASSPATH = CLASSPATH + ":" + LIB + '/derby/*'
# orchestrator http needs codecs
CLASSPATH = CLASSPATH + ":" + LIB + '/http-client/*'
-
+
# explicitly NOT ducc_test.jar
CLASSPATH = CLASSPATH + ':' + ducc_home + '/webserver/lib/*'
CLASSPATH = CLASSPATH + ':' + ducc_home + '/webserver/lib/jsp/*'
+
+ CLASSPATH = CLASSPATH + ":" + ducc_home + '/apache-uima/apache-activemq/lib/*'
+ CLASSPATH = CLASSPATH + ":" + ducc_home + '/apache-uima/apache-activemq/lib/optional*'
+
CLASSPATH = CLASSPATH + ':' + LIB + '/uima-ducc/*'
CLASSPATH = CLASSPATH + ':' + RESOURCES
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=1594268&r1=1594267&r2=1594268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Tue May 13 16:26:25 2014
@@ -115,8 +115,37 @@ under the License.
<directoryMode>755</directoryMode>
</dependencySet>
- <!-- UIMA-AS -->
+ <!-- HTTP Support for the broker -->
<dependencySet>
+ <includes>
+ <include>org.apache.httpcomponents:httpclient</include>
+ <include>org.apache.httpcomponents:httpcore</include>
+ <include>xpp3:xpp3</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>apache-uima/apache-activemq/lib/optional</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <fileMode>644</fileMode>
+ <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>
<includes>
<include>org.apache.uima:uimaj-as-core</include>
@@ -124,14 +153,14 @@ under the License.
<include>org.apache.uima:uimaj-as-activemq</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
- <outputDirectory>lib/uima</outputDirectory>
+ <outputDirectory>apache-uima/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
+ </dependencySet -->
<!-- UIMA Core -->
- <dependencySet>
+ <!--dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.uima:uimaj-core</include>
@@ -141,7 +170,7 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
+ </dependencySet -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
@@ -273,7 +302,7 @@ under the License.
<directoryMode>755</directoryMode>
</dependencySet>
- <dependencySet>
+ <!--dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>commons-logging:commons-logging</include>
@@ -300,7 +329,7 @@ under the License.
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-beans</include>
- <!-- include>org.springframework:spring-aop</include -->
+
<include>org.springframework:spring-tx</include>
<include>org.springframework:spring-asm</include>
<include>org.springframework:spring-jms</include>
@@ -312,7 +341,6 @@ under the License.
<include>log4j:log4j</include>
- <!-- include>aopalliance:aopalliance</include -->
<include>xpp3:xpp3</include>
@@ -324,6 +352,21 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
+ </dependencySet-->
+
+ <dependencySet>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>org.apache.activemq:activemq-jaas</include>
+ <include>commons-pool:commons-pool</include>
+ </includes>
+
+ <outputDirectory>apache-uima/apache-activemq/lib</outputDirectory>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
</dependencySet>
@@ -392,10 +435,25 @@ under the License.
<!-- Add other files - scripts, documentation, examples -->
<fileSets>
+ <!-- UIMA SDK -->
+ <fileSet>
+ <directory>target/uimaj/apache-uima</directory>
+ <outputDirectory>apache-uima</outputDirectory>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- UIMA-AS -->
+ <fileSet>
+ <directory>target/uima-as/apache-uima-as-${org.apache.uima.as.version}</directory>
+ <outputDirectory>apache-uima</outputDirectory>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
<!-- ACTIVEMQ -->
- <fileSet>
+ <!--fileSet>
<directory>target/apache-activemq/apache-activemq-${org.apache.activemq.version}</directory>
<outputDirectory>activemq</outputDirectory>
<includes>
@@ -420,11 +478,12 @@ under the License.
</excludes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
- </fileSet>
+ </fileSet -->
<fileSet>
<directory>src/main/config/</directory>
- <outputDirectory>activemq/conf</outputDirectory>
+ <!-- outputDirectory>activemq/conf</outputDirectory -->
+ <outputDirectory>apache-uima/apache-activemq/conf</outputDirectory>
<includes>
<include>activemq-ducc.xml</include>
<include>ducc-broker-credentials.properties</include>
@@ -748,11 +807,11 @@ under the License.
</file>
- <file>
+ <!--file>
<source>src/main/config/README.txt</source>
<outputDirectory>activemq</outputDirectory>
<fileMode>644</fileMode>
- </file>
+ </file -->
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=1594268&r1=1594267&r2=1594268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Tue May 13 16:26:25 2014
@@ -166,6 +166,13 @@
<orbit-org-apache-jasper.version>2.1.0.v201110031002</orbit-org-apache-jasper.version>
<servlet-api.version>2.5</servlet-api.version>
<derby.version>10.10.1.1</derby.version>
+
+ <xpp3.version>1.1.4c</xpp3.version>
+
+ <http.commons.client.version>4.2.1</http.commons.client.version>
+
+ <http.commons.core.version>4.2.1</http.commons.core.version>
+
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
<projectTimeSpan>2012</projectTimeSpan>
@@ -207,6 +214,32 @@ ${uimaDUCCNoticeText}
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${http.commons.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${http.commons.core.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-cli</artifactId>
@@ -599,6 +632,31 @@ ${uimaDUCCNoticeText}
<dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+
+ </dependency>
+
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>