You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/12/16 22:49:22 UTC
svn commit: r727173 - in
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller:
AggregateAnalysisEngineController_impl.java BaseAnalysisEngineController.java
PrimitiveAnalysisEngineController_impl.java
Author: eae
Date: Tue Dec 16 13:49:22 2008
New Revision: 727173
URL: http://svn.apache.org/viewvc?rev=727173&view=rev
Log:
UIMA-1254 commit uimaj-as-activemq-UIMA-1254-patch.txt and uimaj-as-core-UIMA-1254-patch.txt (minus the println)
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=727173&r1=727172&r2=727173&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Tue Dec 16 13:49:22 2008
@@ -2304,7 +2304,7 @@
if ( isTopLevelComponent() && getInputChannel() != null )
{
serviceInfo.setInputQueueName(getInputChannel().getName());
- serviceInfo.setBrokerURL(getInputChannel().getServerUri());
+ serviceInfo.setBrokerURL(super.getBrokerURL());
}
else
{
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=727173&r1=727172&r2=727173&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Tue Dec 16 13:49:22 2008
@@ -1506,6 +1506,12 @@
}
public String getBrokerURL()
{
+ // Wait until the connection factory is injected by Spring
+ while ( System.getProperty("BrokerURI") == null) {
+ try {
+ Thread.sleep(50);
+ } catch ( InterruptedException ex) {}
+ }
return System.getProperty("BrokerURI");
}
public String getInputQueue()
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=727173&r1=727172&r2=727173&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java Tue Dec 16 13:49:22 2008
@@ -720,7 +720,7 @@
if ( isTopLevelComponent() && getInputChannel() != null )
{
serviceInfo.setInputQueueName(getInputChannel().getServiceInfo().getInputQueueName());
- serviceInfo.setBrokerURL(getInputChannel().getServiceInfo().getBrokerURL());
+ serviceInfo.setBrokerURL(super.getBrokerURL());
}
serviceInfo.setState("Running");