You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/10/15 22:59:03 UTC
svn commit: r825654 - in /incubator/uima/uima-as/trunk/uimaj-as-activemq:
pom.xml
src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java
Author: schor
Date: Thu Oct 15 20:59:03 2009
New Revision: 825654
URL: http://svn.apache.org/viewvc?rev=825654&view=rev
Log:
UIMA-1622 fix up pom by removing many dependencies. Note that this doesn't actually reduce the dependencies, because most of them still are transitive dependencies. However mvn dependency:analyze is a lot cleaner. Also remove old imports in Test case that are not used, and add message to the SpringContainerDeployer in case of initialization error saying to look in the uima log for details.
Modified:
incubator/uima/uima-as/trunk/uimaj-as-activemq/pom.xml
incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=825654&r1=825653&r2=825654&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/pom.xml Thu Oct 15 20:59:03 2009
@@ -36,12 +36,12 @@
</parent>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
<scope>compile</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.uima</groupId>
@@ -51,39 +51,26 @@
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-examples</artifactId>
- <version>${uimaj-release-version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.0.6</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apache-activemq</artifactId>
<version>4.1.1</version>
<exclusions>
- <exclusion>
<!-- exclude xstream 1.1.2 because it is broken
xstream 1.2.2 (the fixed version) is included in another pom -->
+ <!--exclusion>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- </exclusion>
+ </exclusion-->
</exclusions>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>4.1.1</version>
@@ -93,9 +80,9 @@
<artifactId>activemq-core</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<version>4.1.1</version>
@@ -105,37 +92,37 @@
<artifactId>activemq-optional</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>3.0.0-incubator</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>4.1.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
<version>4.1.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<version>4.1.1</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>mx4j</groupId>
@@ -145,53 +132,59 @@
<!-- lib/optional -->
- <dependency>
+ <!--dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency-->
+
+ <!--dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>1.0</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<version>1.0</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
<version>1.0-RC2</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>mx4j</groupId>
@@ -199,11 +192,11 @@
<version>2.1.1</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>2.1.1</version>
- </dependency>
+ </dependency-->
<dependency>
@@ -220,13 +213,13 @@
<scope>compile</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.0.1</version>
@@ -242,32 +235,42 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>6.0.1</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
<version>1.1.3.4d_b4_min</version>
- </dependency>
+ </dependency-->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.1.0</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>2.8</version>
- </dependency>
+ </dependency-->
+
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-examples</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ </dependency-->
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java?rev=825654&r1=825653&r2=825654&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java Thu Oct 15 20:59:03 2009
@@ -55,7 +55,7 @@
private volatile boolean serviceInitializationCompleted;
private volatile boolean serviceInitializationException;
-
+
private Semaphore serviceInitializationSemaphore = new Semaphore(1);
private ConcurrentHashMap springContainerRegistry = null;
@@ -429,7 +429,7 @@
serviceInitializationSemaphore.release();
}
if (serviceInitializationException) {
- throw new ResourceInitializationException();
+ throw new ResourceInitializationException(new Exception("Details of failure(s) written to UIMA log"));
}
}
Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java?rev=825654&r1=825653&r2=825654&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASBasic.java Thu Oct 15 20:59:03 2009
@@ -31,7 +31,6 @@
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMA_IllegalStateException;
import org.apache.uima.aae.UimaClassFactory;
import org.apache.uima.aae.client.UimaAsynchronousEngine;
@@ -42,17 +41,10 @@
import org.apache.uima.adapter.jms.client.BaseUIMAAsynchronousEngine_impl;
import org.apache.uima.adapter.jms.message.JmsMessageContext;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.cas.CAS;
-import org.apache.uima.collection.CollectionReader;
-import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.ee.test.utils.BaseTestSupport;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
-import org.apache.uima.util.Level;
-import org.apache.uima.util.XMLInputSource;
-
-import com.thoughtworks.xstream.XStream.InitializationException;
public class TestUimaASBasic extends BaseTestSupport {
private static final int DEFAULT_HTTP_PORT = 8888;