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 2009/06/29 16:03:05 UTC
svn commit: r789331 -
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
Author: cwiklik
Date: Mon Jun 29 14:03:05 2009
New Revision: 789331
URL: http://svn.apache.org/viewvc?rev=789331&view=rev
Log:
UIMA-1109 Modified to set topLevelController when deploy cpp based controller
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java?rev=789331&r1=789330&r2=789331&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java Mon Jun 29 14:03:05 2009
@@ -148,7 +148,6 @@
{
((FileSystemXmlApplicationContext) ctx).setDisplayName(cntlr.getComponentName());
cntlr.addControllerCallbackListener(this);
- topLevelController = cntlr;
String inputQueueName = cntlr.getServiceEndpointName();
if ( inputQueueName != null )
@@ -251,30 +250,22 @@
serviceInitializationException = false;
// Wrap Spring context
UimaEEAdminSpringContext springAdminContext = new UimaEEAdminSpringContext((FileSystemXmlApplicationContext) ctx);
- // Find all deployed instances of the Broker Deployer
- // String[] brokerDeployer = ctx.getBeanNamesForType(org.apache.uima.adapter.jms.activemq.BrokerDeployer.class);
// Find all deployed Controllers
String[] controllers = ctx.getBeanNamesForType(org.apache.uima.aae.controller.AnalysisEngineController.class);
for (int i = 0; controllers != null && i < controllers.length; i++) {
AnalysisEngineController cntlr = (AnalysisEngineController) ctx.getBean(controllers[i]);
if ( cntlr instanceof org.apache.uima.aae.controller.UimacppServiceController ) {
cntlr.addControllerCallbackListener(this);
+ topLevelController = cntlr;
} else {
// Pass a reference to the context to each of the Controllers
cntlr.setUimaEEAdminContext(springAdminContext);
if (cntlr.isTopLevelComponent()) {
+ topLevelController = cntlr;
initializeTopLevelController( cntlr, ctx);
}
}
}
-/*
- String[] cppcontrollers = ctx.getBeanNamesForType(org.apache.uima.aae.controller.UimacppServiceController.class);
- for (int i = 0; cppcontrollers != null && i < cppcontrollers.length; i++) {
- UimacppServiceController cntlr = (UimacppServiceController) ctx.getBean(cppcontrollers[i]);
- // register listener
- cntlr.addControllerCallbackListener(this);
- }
-*/
// blocks until the top level controller sends a notification.
// Notification is send
// when either the controller successfully initialized or it failed