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 2010/12/20 21:55:03 UTC
svn commit: r1051287 - in
/uima/uima-as/trunk/uima-as-distr/src/main/assembly: bin.xml src.xml
Author: cwiklik
Date: Mon Dec 20 20:55:03 2010
New Revision: 1051287
URL: http://svn.apache.org/viewvc?rev=1051287&view=rev
Log:
UIMA-1876 Modified to support AMQ 5.4.1
Modified:
uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml
Modified: uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml?rev=1051287&r1=1051286&r2=1051287&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml Mon Dec 20 20:55:03 2010
@@ -36,6 +36,8 @@ under the License.
<dependencySets>
<!-- UIMA-AS -->
+
+
<dependencySet>
<includes>
<include>org.apache.uima:uimaj-as-activemq</include>
@@ -51,49 +53,69 @@ under the License.
</dependencySet>
<!-- UIMA-AS included other projects -->
+
+ <dependencySet>
+ <includes>
+ <include>org.apache.activemq:activemq-all</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>apache-activemq-5.4.1</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </dependencySet>
+
+
<dependencySet>
<includes>
<include>commons-logging:commons-logging</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.apache.activemq:activemq-camel</include>
+ <include>org.apache.activemq:kahadb</include>
<include>org.apache.activemq:activemq-console</include>
- <include>org.apache.activemq:activeio-core</include>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>org.apache.activemq:activemq-jaas</include>
- <include>org.apache.activemq:activemq-web</include>
- <include>mx4j:mx4j</include>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.activemq:activemq-spring</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.springframework:spring-asm</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-tx</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-expression</include>
+ <include>org.springframework:spring-jms</include>
+ <include>org.springframework:xbean-spring</include>
+ <include>org.apache.xbean:xbean-spring</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
- <outputDirectory>apache-activemq-4.1.1/lib</outputDirectory>
+ <outputDirectory>apache-activemq-5.4.1/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
+
<dependencySet>
<includes>
- <include>org.springframework:spring</include>
+ <include>commons-codec:commons-codec</include>
<include>commons-httpclient:commons-httpclient</include>
- <include>org.mortbay.jetty:jetty</include>
- <include>org.mortbay.jetty:jetty-util</include>
- <include>org.mortbay.jetty:servlet-api-2.5</include>
- <include>xmlpull:xmlpull</include> <!-- need for uima-as -->
- <include>com.thoughtworks.xstream:xstream</include> <!-- need for uima-as -->
+ <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
+ <include>com.thoughtworks.xstream:xstream</include>
+ <include>xmlpull:xmlpull</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+<!--
+ <include>xmlpull:xmlpull</include>
<include>org.apache.derby:derby</include>
- <include>org.apache.xbean:xbean-spring</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
<include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
- <include>activemq:jmdns</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.1_spec</include>
+ <include>activemq:jmdns</include> -->
<include>log4j:log4j</include>
- <include>mx4j:mx4j-remote</include>
- <include>mx4j:mx4j-tools</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
- <outputDirectory>apache-activemq-4.1.1/lib/optional</outputDirectory>
+ <outputDirectory>apache-activemq-5.4.1/lib/optional</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -352,24 +374,36 @@ under the License.
</fileSet>
<!-- activemq -->
+
+
<fileSet>
- <directory>src/main/apache-activemq-4.1.1</directory>
- <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+ <directory>src/main/apache-activemq-5.4.1</directory>
+ <outputDirectory>apache-activemq-5.4.1</outputDirectory>
<includes><include>bin/**</include></includes>
<excludes><exclude>bin/**/*.*</exclude></excludes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <fileSet>
+ <directory>src/main/apache-activemq-5.4.1</directory>
+ <outputDirectory>apache-activemq-5.4.1</outputDirectory>
+ <includes><include>conf/**</include></includes>
+ <excludes><exclude>conf/**/*.*</exclude></excludes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
<fileSet>
- <directory>src/main/apache-activemq-4.1.1</directory>
- <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+ <directory>src/main/apache-activemq-5.4.1</directory>
+ <outputDirectory>apache-activemq-5.4.1</outputDirectory>
<includes><include>bin/**/*.*</include></includes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>src/main/apache-activemq-4.1.1</directory>
- <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+ <directory>src/main/apache-activemq-5.4.1</directory>
+ <outputDirectory>apache-activemq-5.4.1</outputDirectory>
<excludes><exclude>bin/**</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
Modified: uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml?rev=1051287&r1=1051286&r2=1051287&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml Mon Dec 20 20:55:03 2010
@@ -44,7 +44,7 @@ under the License.
<excludes>
<!--exclude>src/main/readme/**</exclude-->
<exclude>src/**/*.sh</exclude>
- <exclude>src/main/apache-activemq-4.1.1/bin/**</exclude>
+ <exclude>src/main/apache-activemq-5.4.1/bin/**</exclude>
</excludes>
<fileMode>644</fileMode>
</fileSet>
@@ -56,13 +56,13 @@ under the License.
<include>src/**/*.sh</include>
<!-- marks scripts, .so files as executable
skip .bat .jar .conf and .jnilib -->
- <include>src/main/apache-activemq-4.1.1/bin/**</include>
+ <include>src/main/apache-activemq-5.4.1/bin/**</include>
</includes>
<excludes>
- <exclude>src/main/apache-activemq-4.1.1/bin/**/*.bat</exclude>
- <exclude>src/main/apache-activemq-4.1.1/bin/**/*.jar</exclude>
- <exclude>src/main/apache-activemq-4.1.1/bin/**/*.conf</exclude>
- <exclude>src/main/apache-activemq-4.1.1/bin/**/*.jnilib</exclude>
+ <exclude>src/main/apache-activemq-5.4.1/bin/**/*.bat</exclude>
+ <exclude>src/main/apache-activemq-5.4.1/bin/**/*.jar</exclude>
+ <exclude>src/main/apache-activemq-5.4.1/bin/**/*.conf</exclude>
+ <exclude>src/main/apache-activemq-5.4.1/bin/**/*.jnilib</exclude>
</excludes>
<fileMode>755</fileMode>
</fileSet>
@@ -71,10 +71,10 @@ under the License.
<directory>.</directory>
<outputDirectory>uima-as-distr</outputDirectory>
<includes>
- <include>src/main/apache-activemq-4.1.1/bin/**/*.bat</include>
- <include>src/main/apache-activemq-4.1.1/bin/**/*.jar</include>
- <include>src/main/apache-activemq-4.1.1/bin/**/*.conf</include>
- <include>src/main/apache-activemq-4.1.1/bin/**/*.jnilib</include>
+ <include>src/main/apache-activemq-5.4.1/bin/**/*.bat</include>
+ <include>src/main/apache-activemq-5.4.1/bin/**/*.jar</include>
+ <include>src/main/apache-activemq-5.4.1/bin/**/*.conf</include>
+ <include>src/main/apache-activemq-5.4.1/bin/**/*.jnilib</include>
</includes>
<fileMode>644</fileMode>
</fileSet>