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 2013/11/21 20:16:20 UTC
svn commit: r1544292 - in /uima/sandbox/uima-ducc/trunk:
src/main/admin/ducc_util.py src/main/assembly/bin.xml uima-ducc-cli/pom.xml
Author: burn
Date: Thu Nov 21 19:16:20 2013
New Revision: 1544292
URL: http://svn.apache.org/r1544292
Log:
UIMA-3434 Remove duplicate slf4j jars to avoid the multiple bindings msg (correct previous Jira #)
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/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=1544292&r1=1544291&r2=1544292&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 Thu Nov 21 19:16:20 2013
@@ -231,7 +231,8 @@ class DuccUtil(DuccBase):
extra_jars = local_jars.split()
for j in extra_jars:
CLASSPATH = CLASSPATH + ':' + LIB + '/' + j
-
+
+ # Drop slf4j dir as its jars also in springframeork
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons/*'
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons-lang/*'
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons-cli/*'
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=1544292&r1=1544291&r2=1544292&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Thu Nov 21 19:16:20 2013
@@ -231,8 +231,8 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
-
+ </dependencySet>
+
<dependencySet>
<includes>
<include>org.apache.activemq:activemq-core</include>
@@ -257,7 +257,7 @@ under the License.
<include>commons-httpclient:commons-httpclient</include>
<include>commons-codec:commons-codec</include>
- <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
+ <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>org.apache.activemq:activemq-camel</include>
@@ -363,24 +363,24 @@ under the License.
<directory>target/apache-activemq/apache-activemq-5.6.0</directory>
<outputDirectory>ducc_runtime/activemq</outputDirectory>
<includes>
- <include>bin/*</include>
- <include>bin/**/*</include>
- <include>**/conf/credentials-enc.properties</include>
- <include>**/conf/credentials.properties</include>
- <include>**/conf/log4j.properties</include>
- <include>**/conf/logging.properties</include>
- <include>activemq-all-5.6.0.jar</include>
+ <include>bin/*</include>
+ <include>bin/**/*</include>
+ <include>**/conf/credentials-enc.properties</include>
+ <include>**/conf/credentials.properties</include>
+ <include>**/conf/log4j.properties</include>
+ <include>**/conf/logging.properties</include>
+ <include>activemq-all-5.6.0.jar</include>
</includes>
<excludes>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README.txt</exclude>
- <exclude>user-guide.html</exclude>
- <exclude>WebConsole-README.txt</exclude>
- <exclude>**/example/*</exclude>
- <exclude>**/example/**/*</exclude>
- <exclude>**/webapps/*</exclude>
- <exclude>**/docs/*</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>user-guide.html</exclude>
+ <exclude>WebConsole-README.txt</exclude>
+ <exclude>**/example/*</exclude>
+ <exclude>**/example/**/*</exclude>
+ <exclude>**/webapps/*</exclude>
+ <exclude>**/docs/*</exclude>
</excludes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
@@ -390,8 +390,8 @@ under the License.
<directory>src/main/config/</directory>
<outputDirectory>ducc_runtime/activemq/conf</outputDirectory>
<includes>
- <include>activemq-ducc.xml</include>
- <include>ducc-broker-credentials.properties</include>
+ <include>activemq-ducc.xml</include>
+ <include>ducc-broker-credentials.properties</include>
</includes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
@@ -402,8 +402,8 @@ under the License.
<directory>src/main/legal/</directory>
<outputDirectory>ducc_runtime</outputDirectory>
<includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
@@ -501,8 +501,8 @@ under the License.
<directoryMode>755</directoryMode>
<includes />
<excludes>
- <exclude>dd2spring.bat</exclude>
- <exclude>dd2spring.xsl</exclude>
+ <exclude>dd2spring.bat</exclude>
+ <exclude>dd2spring.xsl</exclude>
</excludes>
</fileSet>
@@ -521,7 +521,7 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
<includes>
- <include>README*</include>
+ <include>README*</include>
</includes>
<excludes />
</fileSet>
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=1544292&r1=1544291&r2=1544292&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Thu Nov 21 19:16:20 2013
@@ -16,31 +16,31 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-ducc-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../uima-ducc-parent/pom.xml</relativePath>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-ducc-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../uima-ducc-parent/pom.xml</relativePath>
</parent>
<!-- Special inheritance note even though the <scm> element that follows
- is exactly the same as those in super poms, it cannot be inherited because
- there is some special code that computes the connection elements from the
- chain of parent poms, if this is omitted. Keeping this a bit factored allows
- cutting/pasting the <scm> element, and just changing the following two properties -->
+ is exactly the same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements from the
+ chain of parent poms, if this is omitted. Keeping this a bit factored allows
+ cutting/pasting the <scm> element, and just changing the following two properties -->
<scm>
- <connection>
+ <connection>
scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli
</connection>
- <developerConnection>
+ <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli
</developerConnection>
- <url>
+ <url>
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli
</url>
</scm>
@@ -56,17 +56,17 @@ uima-ducc-common.jar uima-ducc-transport
<artifactId>uima-ducc-cli</artifactId>
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-ducc-common</artifactId>
- <version>${ducc.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-ducc-common</artifactId>
+ <version>${ducc.version}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-ducc-transport</artifactId>
- <version>${ducc.version}</version>
- </dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-ducc-transport</artifactId>
+ <version>${ducc.version}</version>
+ </dependency>
</dependencies>
@@ -78,18 +78,18 @@ uima-ducc-common.jar uima-ducc-transport
<configuration>
<archive>
<!-- Only create an index if it indexes ALL classes used in all the classpath jars -->
- <index>false</index>
- <manifest>
- <addClasspath>false</addClasspath>
- </manifest>
- <manifestEntries>
- <class-path>${DUCC_CP}</class-path>
+ <index>false</index>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <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>
- </manifestEntries>
+ </manifestEntries>
</archive>
</configuration>
@@ -109,10 +109,10 @@ uima-ducc-common.jar uima-ducc-transport
</execution>
</executions>
-
+
</plugin>
</plugins>
</build>
</project>
-
+