Return-Path: 
 <uima-commits-return-4531-apmail-incubator-uima-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-uima-commits-archive@locus.apache.org
Received: (qmail 91396 invoked from network); 6 Oct 2008 21:02:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Oct 2008 21:02:50 -0000
Received: (qmail 41860 invoked by uid 500); 6 Oct 2008 21:02:49 -0000
Delivered-To: apmail-incubator-uima-commits-archive@incubator.apache.org
Received: (qmail 41824 invoked by uid 500); 6 Oct 2008 21:02:49 -0000
Mailing-List: contact uima-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:uima-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:uima-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:uima-commits@incubator.apache.org>
List-Id: <uima-commits.incubator.apache.org>
Reply-To: uima-dev@incubator.apache.org
Delivered-To: mailing list uima-commits@incubator.apache.org
Received: (qmail 41771 invoked by uid 99); 6 Oct 2008 21:02:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 14:02:49 -0700
X-ASF-Spam-Status: No, hits=-1999.9 required=10.0
	tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 21:01:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 465ED2388886; Mon,  6 Oct 2008 14:01:50 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r702261 [2/4] - in
 /incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src: main/scripts/
 test/java/org/apache/uima/as/dd/ test/resources/deploy/
 test/resources/deploy/expected/ test/resources/descriptors/analysis_engine/
 test/resources/des...
Date: Mon, 06 Oct 2008 21:01:49 -0000
To: uima-commits@incubator.apache.org
From: schor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081006210150.465ED2388886@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml?rev=702261&r1=702260&r2=702261&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml Mon Oct  6 14:01:48 2008
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--==================================================================================-->
- <!-- Generated from                                                                                 -->
- <!-- file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/deploy/Deploy_MeetingFinder.xml -->
- <!-- 11 April, 2008, 4:59:54 A.M.                                                                   -->
+ <!-- Generated from                                                                             -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_MeetingFinder.xml -->
+ <!-- 6 October, 2008, 4:02:05 P.M.                                                              -->
  <!--==================================================================================-->
  <!DOCTYPE beans
   PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 
-   <!-- connection factory for co-located things -->
-   <bean id="controllerJmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
-         depends-on="brokerDeployerService">
-      <property name="brokerURL" value="vm://localhost"/>
-      <property name="prefetchPolicy" ref="prefetchPolicy"/>
-   </bean>
-
-   <!-- Deploys a co-located broker  -->
-   <bean id="brokerDeployerService"
-         class="org.apache.uima.adapter.jms.activemq.BrokerDeployer">
-      <constructor-arg index="0" value="1048576000"/>
-   </bean>
-
    <!-- Factory for specific external queue broker:  -->
    <!--            tcp://localhost:61616             -->
    <bean id="qBroker_tcp_c__ss_localhost_c_61616"
@@ -53,7 +40,7 @@
    <bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
       <property name="queuePrefetch" value="0"/>
    </bean>
-
+ 
    <!--=================================-->
    <!--    E r r o r   D e t a i l s    -->
    <!--=================================-->
@@ -97,7 +84,7 @@
       <property name="action" value="terminate"/>
    </bean>
 
-
+ 
    <!--input queue for service-->
    <bean id="top_level_input_queue_service_1"
          class="org.apache.activemq.command.ActiveMQQueue">
@@ -114,7 +101,7 @@
       </constructor-arg>
       <constructor-arg index="1" value="MeetingFinderQueue"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/MeetingFinderAggregate.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/MeetingFinderAggregate.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
       <constructor-arg index="5" ref="delegate_map_MeetingFinderQueue_1"/>
@@ -125,12 +112,12 @@
       <property name="flowControllerDescriptor"
                 value="*importByName:org.apache.uima.flow.FixedFlowController"/>
    </bean>
-
+ 
    <!--===================================================-->
    <!--   M E S S A G E    H A N D L E R: aggregate_input -->
    <!--  for controller: asAggr_ctlr_MeetingFinderQueue_1 -->
    <!--===================================================-->
-
+   
    <bean id="aggregate_input_metaMsgHandler_MeetingFinderQueue_1"
          class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
       <constructor-arg index="0" value="MetadataRequestHandler"/>
@@ -145,43 +132,8 @@
       <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
    </bean>
 
-   <!--====================================================-->
-   <!--   M E S S A G E    H A N D L E R: aggregate_return -->
-   <!--  for controller: asAggr_ctlr_MeetingFinderQueue_1  -->
-   <!--====================================================-->
-
-   <bean id="aggregate_return_metaMsgHandler_MeetingFinderQueue_1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processRequestHandler_MeetingFinderQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_processRequestHandler_MeetingFinderQueue_1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processResponseHandler_MeetingFinderQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_processResponseHandler_MeetingFinderQueue_1"
-         class="org.apache.uima.aae.handler.input.ProcessResponseHandler">
-      <constructor-arg index="0" value="ProcessResponseHandler"/>
-      <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_response_metaMsgHandler_MeetingFinderQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_response_metaMsgHandler_MeetingFinderQueue_1"
-         class="org.apache.uima.aae.handler.input.MetadataResponseHandler_impl">
-      <constructor-arg index="0" value="MetadataResponseHandler"/>
-      <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
-   </bean>
-
    <!-- Create the endpoints + output channels, one per delegate -->
-
+   
 
    <!-- ==================================== -->
    <!--           CollectionReader           -->
@@ -200,6 +152,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -219,6 +173,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="100000"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -238,6 +194,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -256,6 +214,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
@@ -308,42 +268,6 @@
       <property name="messageSelector" value="Command=2001"/>
    </bean>
 
-   <!-- return queue for async aggregate -->
-   <bean id="asynAggr_retQ_MeetingFinderQueue_1"
-         class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="asynAggr_retQ_MeetingFinderQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!-- JMS msg listener for return queue for: -->
-   <!--   asynAggr_retQ_MeetingFinderQueue_1   -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_q_listenerID_MeetingFinderQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler"
-                ref="aggregate_return_metaMsgHandler_MeetingFinderQueue_1"/>
-      <property name="endpointName" value="asynAggr_retQ_MeetingFinderQueue_1"/>
-      <property name="controller" ref="asAggr_ctlr_MeetingFinderQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!-- JMS msg listener container for return queue for: -->
-   <!--        asynAggr_retQ_MeetingFinderQueue_1        -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_msgLsnrCntnr_MeetingFinderQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    return Queue    -->
-     <property name="destination" ref="asynAggr_retQ_MeetingFinderQueue_1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="asAggr_return_q_listenerID_MeetingFinderQueue_1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-   </bean>
-
    <!-- ================================== -->
    <!-- OutputChannel - for flows out of   -->
    <!-- this component, both to delegates  -->
@@ -378,7 +302,7 @@
       </constructor-arg>
    </bean>
 
-
+ 
    <!--========================-->
    <!-- Delegate ErrorHandlers -->
    <!--========================-->
@@ -448,7 +372,7 @@
       </constructor-arg>
    </bean>
 
-
+ 
    <!--=======================-->
    <!--  Error Handler Chain  -->
    <!--=======================-->
@@ -462,14 +386,6 @@
          </list>
       </constructor-arg>
    </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--       CollectionReader       -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_CollectionReader_1.1" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_CollectionReader_1.1"/>
-   </bean>
    <!--===============================================-->
    <!-- Primitive or non-Async Aggr: CollectionReader -->
    <!--===============================================-->
@@ -481,7 +397,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="CollectionReader"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/FileSystemCollectionReader.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/FileSystemCollectionReader.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -496,107 +412,6 @@
 
      <!-- CAS Multiplier initial heap size -->
      <constructor-arg index="8" value="2000000"/>
-      <property name="outputChannel" ref="outChnl_CollectionReader_1.1"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_CollectionReader_1.1"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
-
-   <!--======================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive          -->
-   <!--  for controller: primitive_ctlr_CollectionReader_1.1 -->
-   <!--======================================================-->
-
-   <bean id="primitive_metaMsgHandler_CollectionReader_1.1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_CollectionReader_1.1"/>
-      <property name="delegate" ref="primitive_processRequestHandler_CollectionReader_1.1"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_CollectionReader_1.1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_CollectionReader_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--        inQ_CollectionReader_1.1        -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_CollectionReader_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_CollectionReader_1.1"/>
-      <property name="endpointName" value="inQ_CollectionReader_1.1"/>
-      <property name="controller" ref="primitive_ctlr_CollectionReader_1.1"/>
-      <property name="listenerContainer"
-                ref="primitive_input_msgLsnrCntnr_CollectionReader_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--             inQ_CollectionReader_1.1             -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_CollectionReader_1.1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_CollectionReader_1.1"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_CollectionReader_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_CollectionReader_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                 inQ_CollectionReader_1.1                 -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_CollectionReader_1.1_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_CollectionReader_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_CollectionReader_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_CollectionReader_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_CollectionReader_1.1"/>
-      <property name="controller" ref="primitive_ctlr_CollectionReader_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--       TokenAndSentence       -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_TokenAndSentence_1.2" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_TokenAndSentence_1.2"/>
    </bean>
    <!--===============================================-->
    <!-- Primitive or non-Async Aggr: TokenAndSentence -->
@@ -609,7 +424,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="TokenAndSentence"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/SimpleTokenAndSentenceAnnotator.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/SimpleTokenAndSentenceAnnotator.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -618,107 +433,6 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_TokenAndSentence_1.2"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_TokenAndSentence_1.2"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
-
-   <!--======================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive          -->
-   <!--  for controller: primitive_ctlr_TokenAndSentence_1.2 -->
-   <!--======================================================-->
-
-   <bean id="primitive_metaMsgHandler_TokenAndSentence_1.2"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_TokenAndSentence_1.2"/>
-      <property name="delegate" ref="primitive_processRequestHandler_TokenAndSentence_1.2"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_TokenAndSentence_1.2"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_TokenAndSentence_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--        inQ_TokenAndSentence_1.2        -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_TokenAndSentence_1.2"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_TokenAndSentence_1.2"/>
-      <property name="endpointName" value="inQ_TokenAndSentence_1.2"/>
-      <property name="controller" ref="primitive_ctlr_TokenAndSentence_1.2"/>
-      <property name="listenerContainer"
-                ref="primitive_input_msgLsnrCntnr_TokenAndSentence_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--             inQ_TokenAndSentence_1.2             -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_TokenAndSentence_1.2"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_TokenAndSentence_1.2"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_TokenAndSentence_1.2"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_TokenAndSentence_1.2"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                 inQ_TokenAndSentence_1.2                 -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_TokenAndSentence_1.2_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_TokenAndSentence_1.2"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_TokenAndSentence_1.2"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_TokenAndSentence_1.2"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_TokenAndSentence_1.2"/>
-      <property name="controller" ref="primitive_ctlr_TokenAndSentence_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--       MeetingDetector        -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_MeetingDetector_1.3" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_MeetingDetector_1.3"/>
    </bean>
    <!--==============================================-->
    <!-- Primitive or non-Async Aggr: MeetingDetector -->
@@ -731,7 +445,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="MeetingDetector"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/MeetingDetectorTAE.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/MeetingDetectorTAE.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -740,106 +454,6 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_MeetingDetector_1.3"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_MeetingDetector_1.3"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
-
-   <!--=====================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive         -->
-   <!--  for controller: primitive_ctlr_MeetingDetector_1.3 -->
-   <!--=====================================================-->
-
-   <bean id="primitive_metaMsgHandler_MeetingDetector_1.3"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_MeetingDetector_1.3"/>
-      <property name="delegate" ref="primitive_processRequestHandler_MeetingDetector_1.3"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_MeetingDetector_1.3"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_MeetingDetector_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--        inQ_MeetingDetector_1.3         -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_MeetingDetector_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_MeetingDetector_1.3"/>
-      <property name="endpointName" value="inQ_MeetingDetector_1.3"/>
-      <property name="controller" ref="primitive_ctlr_MeetingDetector_1.3"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_MeetingDetector_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--             inQ_MeetingDetector_1.3              -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_MeetingDetector_1.3"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_MeetingDetector_1.3"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_MeetingDetector_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_MeetingDetector_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                 inQ_MeetingDetector_1.3                  -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_MeetingDetector_1.3_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_MeetingDetector_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_MeetingDetector_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_MeetingDetector_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_MeetingDetector_1.3"/>
-      <property name="controller" ref="primitive_ctlr_MeetingDetector_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--         CasConsumer          -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_CasConsumer_1.4" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_CasConsumer_1.4"/>
    </bean>
    <!--==========================================-->
    <!-- Primitive or non-Async Aggr: CasConsumer -->
@@ -852,7 +466,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="CasConsumer"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/XmiWriterCasConsumer.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/meetingFinder/XmiWriterCasConsumer.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -861,97 +475,5 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_CasConsumer_1.4"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_CasConsumer_1.4"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
-
-   <!--=================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive     -->
-   <!--  for controller: primitive_ctlr_CasConsumer_1.4 -->
-   <!--=================================================-->
-
-   <bean id="primitive_metaMsgHandler_CasConsumer_1.4"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_CasConsumer_1.4"/>
-      <property name="delegate" ref="primitive_processRequestHandler_CasConsumer_1.4"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_CasConsumer_1.4"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_CasConsumer_1.4"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--          inQ_CasConsumer_1.4           -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_CasConsumer_1.4"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_CasConsumer_1.4"/>
-      <property name="endpointName" value="inQ_CasConsumer_1.4"/>
-      <property name="controller" ref="primitive_ctlr_CasConsumer_1.4"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_CasConsumer_1.4"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--               inQ_CasConsumer_1.4                -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_CasConsumer_1.4"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_CasConsumer_1.4"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_CasConsumer_1.4"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_CasConsumer_1.4"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                   inQ_CasConsumer_1.4                    -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_CasConsumer_1.4_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_CasConsumer_1.4"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_CasConsumer_1.4"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_CasConsumer_1.4"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_CasConsumer_1.4"/>
-      <property name="controller" ref="primitive_ctlr_CasConsumer_1.4"/>
    </bean>
-</beans>
+</beans>
\ No newline at end of file

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml?rev=702261&r1=702260&r2=702261&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml Mon Oct  6 14:01:48 2008
@@ -2,25 +2,12 @@
 <!--==================================================================================-->
  <!-- Generated from                                                                               -->
  <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml -->
- <!-- 4 August, 2008, 4:59:18 P.M.                                                                 -->
+ <!-- 6 October, 2008, 3:16:12 P.M.                                                                -->
  <!--==================================================================================-->
  <!DOCTYPE beans
   PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 
-   <!-- connection factory for co-located things -->
-   <bean id="controllerJmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
-         depends-on="brokerDeployerService">
-      <property name="brokerURL" value="vm://localhost"/>
-      <property name="prefetchPolicy" ref="prefetchPolicy"/>
-   </bean>
-
-   <!-- Deploys a co-located broker  -->
-   <bean id="brokerDeployerService"
-         class="org.apache.uima.adapter.jms.activemq.BrokerDeployer">
-      <constructor-arg index="0" value="1048576000"/>
-   </bean>
-
    <!-- Factory for specific external queue broker:  -->
    <!--            tcp://localhost:61616             -->
    <bean id="qBroker_tcp_c__ss_localhost_c_61616"
@@ -148,23 +135,9 @@
    <!--  for controller: asAggr_ctlr_RoomNumberAnnotatorQueue_1 -->
    <!--=========================================================-->
    
-   <bean id="aggregate_return_metaMsgHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"/>
-   </bean>
+    
 
-   <bean id="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"
+<bean id="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"
          class="org.apache.uima.aae.handler.input.ProcessResponseHandler">
       <constructor-arg index="0" value="ProcessResponseHandler"/>
       <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
@@ -176,6 +149,14 @@
          class="org.apache.uima.aae.handler.input.MetadataResponseHandler_impl">
       <constructor-arg index="0" value="MetadataResponseHandler"/>
       <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+      <property name="delegate"
+                ref="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"/>
+   </bean>
+
+   <bean id="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"
+         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
+      <constructor-arg index="0" value="ProcessRequestHandler"/>
+      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
    </bean>
 
    <!-- Create the endpoints + output channels, one per delegate -->
@@ -197,6 +178,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -213,7 +196,7 @@
 
      <!-- Queue name used for replies, on the remote broker  -->
      <property name="replyToEndpoint"
-                value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.34.65-ec420e1:11bfae8a82b:-8000"/>
+                value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.34.805b199f85:11cd396016e:-7fff"/>
 
      <!--      Timeouts      -->
      <property name="metadataRequestTimeout" value="60000"/>
@@ -239,6 +222,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
@@ -295,49 +280,12 @@
       <property name="messageSelector" value="Command=2001"/>
    </bean>
 
-   <!-- return queue for async aggregate -->
-   <bean id="asynAggr_retQ_RoomNumberAnnotatorQueue_1"
-         class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!--  JMS msg listener for return queue for:  -->
-   <!-- asynAggr_retQ_RoomNumberAnnotatorQueue_1 -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler"
-                ref="aggregate_return_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
-      <property name="endpointName" value="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!-- JMS msg listener container for return queue for: -->
-   <!--     asynAggr_retQ_RoomNumberAnnotatorQueue_1     -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    return Queue    -->
-     <property name="destination" ref="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener"
-                ref="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-   </bean>
-
    <!-- return queue for http or tcp remote service  -->
    <!--               on remote broker               -->
    <bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime"
          class="org.apache.activemq.command.ActiveMQQueue">
       <constructor-arg index="0"
-                       value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.34.65-ec420e1:11bfae8a82b:-8000"/>
+                       value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.34.805b199f85:11cd396016e:-7fff"/>
    </bean>
 
    <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -347,7 +295,7 @@
    <bean id="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1_DateTime"
          class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
       <property name="messageHandler"
-                ref="aggregate_return_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
+                ref="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"/>
       <property name="endpointName" value=""/>
       <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
    </bean>
@@ -490,14 +438,6 @@
          </list>
       </constructor-arg>
    </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--          RoomNumber          -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_RoomNumber_1.1" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_RoomNumber_1.1"/>
-   </bean>
    <!--=========================================-->
    <!-- Primitive or non-Async Aggr: RoomNumber -->
    <!--=========================================-->
@@ -518,106 +458,6 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_RoomNumber_1.1"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_RoomNumber_1.1"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
- 
-   <!--================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive    -->
-   <!--  for controller: primitive_ctlr_RoomNumber_1.1 -->
-   <!--================================================-->
-   
-   <bean id="primitive_metaMsgHandler_RoomNumber_1.1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-      <property name="delegate" ref="primitive_processRequestHandler_RoomNumber_1.1"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_RoomNumber_1.1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--           inQ_RoomNumber_1.1           -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_RoomNumber_1.1"/>
-      <property name="endpointName" value="inQ_RoomNumber_1.1"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--                inQ_RoomNumber_1.1                -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_RoomNumber_1.1"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_RoomNumber_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_RoomNumber_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                    inQ_RoomNumber_1.1                    -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_RoomNumber_1.1_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_RoomNumber_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_RoomNumber_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_RoomNumber_1.1"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--           Meeting            -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_Meeting_1.3" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_Meeting_1.3"/>
    </bean>
    <!--======================================-->
    <!-- Primitive or non-Async Aggr: Meeting -->
@@ -639,97 +479,5 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_Meeting_1.3"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_Meeting_1.3"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
- 
-   <!--=============================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive -->
-   <!--  for controller: primitive_ctlr_Meeting_1.3 -->
-   <!--=============================================-->
-   
-   <bean id="primitive_metaMsgHandler_Meeting_1.3"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-      <property name="delegate" ref="primitive_processRequestHandler_Meeting_1.3"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_Meeting_1.3"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--            inQ_Meeting_1.3             -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_Meeting_1.3"/>
-      <property name="endpointName" value="inQ_Meeting_1.3"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_Meeting_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--                 inQ_Meeting_1.3                  -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_Meeting_1.3"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_Meeting_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_Meeting_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                     inQ_Meeting_1.3                      -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_Meeting_1.3_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_Meeting_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_Meeting_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_Meeting_1.3"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
    </bean>
 </beans>
\ No newline at end of file

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml?rev=702261&r1=702260&r2=702261&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml Mon Oct  6 14:01:48 2008
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--==================================================================================-->
- <!-- Generated from                                                                                 -->
- <!-- file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml -->
- <!-- 2 November, 2007, 2:33:33 P.M.                                                                 -->
+ <!-- Generated from                                                                              -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml -->
+ <!-- 6 October, 2008, 4:35:28 P.M.                                                               -->
  <!--==================================================================================-->
  <!DOCTYPE beans
   PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 
-   <!-- connection factory for co-located things -->
-   <bean id="controllerJmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
-         depends-on="brokerDeployerService">
-      <property name="brokerURL" value="vm://localhost"/>
-      <property name="prefetchPolicy" ref="prefetchPolicy"/>
-   </bean>
-
-   <!-- Deploys a co-located broker  -->
-   <bean id="brokerDeployerService"
-         class="org.apache.uima.adapter.jms.activemq.BrokerDeployer">
-      <constructor-arg index="0" value="1048576000"/>
-   </bean>
-
    <!-- Factory for specific external queue broker:  -->
    <!--            tcp://localhost:61616             -->
    <bean id="qBroker_tcp_c__ss_localhost_c_61616"
@@ -104,7 +91,7 @@
       </constructor-arg>
       <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
       <constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -134,41 +121,6 @@
       <constructor-arg index="0" value="ProcessRequestHandler"/>
       <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
    </bean>
- 
-   <!--=========================================================-->
-   <!--   M E S S A G E    H A N D L E R: aggregate_return      -->
-   <!--  for controller: asAggr_ctlr_RoomNumberAnnotatorQueue_1 -->
-   <!--=========================================================-->
-   
-   <bean id="aggregate_return_metaMsgHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_processRequestHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_processResponseHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.ProcessResponseHandler">
-      <constructor-arg index="0" value="ProcessResponseHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-      <property name="delegate"
-                ref="aggregate_return_response_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <bean id="aggregate_return_response_metaMsgHandler_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.aae.handler.input.MetadataResponseHandler_impl">
-      <constructor-arg index="0" value="MetadataResponseHandler"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-   </bean>
 
    <!-- Create the endpoints + output channels, one per delegate -->
    
@@ -189,6 +141,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -207,6 +161,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!-- ==================================== -->
@@ -225,6 +181,8 @@
      <property name="metadataRequestTimeout" value="60000"/>
       <property name="processRequestTimeout" value="0"/>
       <property name="collectionProcessCompleteTimeout" value="0"/>
+      <property name="concurrentRequestConsumers" value="1"/>
+      <property name="concurrentReplyConsumers" value="1"/>
    </bean>
 
    <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
@@ -281,43 +239,6 @@
       <property name="messageSelector" value="Command=2001"/>
    </bean>
 
-   <!-- return queue for async aggregate -->
-   <bean id="asynAggr_retQ_RoomNumberAnnotatorQueue_1"
-         class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!--  JMS msg listener for return queue for:  -->
-   <!-- asynAggr_retQ_RoomNumberAnnotatorQueue_1 -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler"
-                ref="aggregate_return_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
-      <property name="endpointName" value="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-      <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <!-- JMS msg listener container for return queue for: -->
-   <!--     asynAggr_retQ_RoomNumberAnnotatorQueue_1     -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-   <bean id="asAggr_return_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    return Queue    -->
-     <property name="destination" ref="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener"
-                ref="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-   </bean>
-
    <!-- ================================== -->
    <!-- OutputChannel - for flows out of   -->
    <!-- this component, both to delegates  -->
@@ -424,14 +345,6 @@
          </list>
       </constructor-arg>
    </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--          RoomNumber          -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_RoomNumber_1.1" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_RoomNumber_1.1"/>
-   </bean>
    <!--=========================================-->
    <!-- Primitive or non-Async Aggr: RoomNumber -->
    <!--=========================================-->
@@ -443,7 +356,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="RoomNumber"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -452,106 +365,6 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_RoomNumber_1.1"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_RoomNumber_1.1"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
- 
-   <!--================================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive    -->
-   <!--  for controller: primitive_ctlr_RoomNumber_1.1 -->
-   <!--================================================-->
-   
-   <bean id="primitive_metaMsgHandler_RoomNumber_1.1"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-      <property name="delegate" ref="primitive_processRequestHandler_RoomNumber_1.1"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_RoomNumber_1.1"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--           inQ_RoomNumber_1.1           -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_RoomNumber_1.1"/>
-      <property name="endpointName" value="inQ_RoomNumber_1.1"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--                inQ_RoomNumber_1.1                -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_RoomNumber_1.1"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_RoomNumber_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_RoomNumber_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                    inQ_RoomNumber_1.1                    -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_RoomNumber_1.1_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_RoomNumber_1.1"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_RoomNumber_1.1"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_RoomNumber_1.1"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_RoomNumber_1.1"/>
-      <property name="controller" ref="primitive_ctlr_RoomNumber_1.1"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--           DateTime           -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_DateTime_1.2" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_DateTime_1.2"/>
    </bean>
    <!--=======================================-->
    <!-- Primitive or non-Async Aggr: DateTime -->
@@ -564,7 +377,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="DateTime"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -573,106 +386,6 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_DateTime_1.2"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_DateTime_1.2"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
- 
-   <!--==============================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive  -->
-   <!--  for controller: primitive_ctlr_DateTime_1.2 -->
-   <!--==============================================-->
-   
-   <bean id="primitive_metaMsgHandler_DateTime_1.2"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_DateTime_1.2"/>
-      <property name="delegate" ref="primitive_processRequestHandler_DateTime_1.2"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_DateTime_1.2"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_DateTime_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--            inQ_DateTime_1.2            -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_DateTime_1.2"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_DateTime_1.2"/>
-      <property name="endpointName" value="inQ_DateTime_1.2"/>
-      <property name="controller" ref="primitive_ctlr_DateTime_1.2"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_DateTime_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--                 inQ_DateTime_1.2                 -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_DateTime_1.2"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_DateTime_1.2"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_DateTime_1.2"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_DateTime_1.2"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                     inQ_DateTime_1.2                     -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_DateTime_1.2_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_DateTime_1.2"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_DateTime_1.2"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_DateTime_1.2"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_DateTime_1.2"/>
-      <property name="controller" ref="primitive_ctlr_DateTime_1.2"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!--   Internal Input Queue for   -->
-   <!--           Meeting            -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="inQ_Meeting_1.3" class="org.apache.activemq.command.ActiveMQQueue">
-      <constructor-arg index="0" value="inQ_Meeting_1.3"/>
    </bean>
    <!--======================================-->
    <!-- Primitive or non-Async Aggr: Meeting -->
@@ -685,7 +398,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="Meeting"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -694,97 +407,5 @@
 
      <!-- scaleout number of instances -->
      <constructor-arg index="6" value="1"/>
-      <property name="outputChannel" ref="outChnl_Meeting_1.3"/>
-   </bean>
-
-   <!-- ThreadPool Task Executor -->
-   <bean id="pooling_Meeting_1.3"
-         class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="1"/>
-      <property name="maxPoolSize" value="1"/>
-      <property name="queueCapacity" value="1"/>
-   </bean>
- 
-   <!--=============================================-->
-   <!--   M E S S A G E    H A N D L E R: primitive -->
-   <!--  for controller: primitive_ctlr_Meeting_1.3 -->
-   <!--=============================================-->
-   
-   <bean id="primitive_metaMsgHandler_Meeting_1.3"
-         class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
-      <constructor-arg index="0" value="MetadataRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-      <property name="delegate" ref="primitive_processRequestHandler_Meeting_1.3"/>
-   </bean>
-
-   <bean id="primitive_processRequestHandler_Meeting_1.3"
-         class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
-      <constructor-arg index="0" value="ProcessRequestHandler"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener for input queue for:  -->
-   <!--            inQ_Meeting_1.3             -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_q_listenerID_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
-      <property name="messageHandler" ref="primitive_metaMsgHandler_Meeting_1.3"/>
-      <property name="endpointName" value="inQ_Meeting_1.3"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
-      <property name="listenerContainer" ref="primitive_input_msgLsnrCntnr_Meeting_1.3"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- JMS msg listener container for input queue for:  -->
-   <!--                 inQ_Meeting_1.3                  -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Connect to pooling task executor for primitive -->
-     <property name="taskExecutor" ref="pooling_Meeting_1.3"/>
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_Meeting_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_Meeting_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2000 OR Command=2002"/>
-   </bean>
-
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <!-- GetMeta JMS msg listener container for input queue for:  -->
-   <!--                     inQ_Meeting_1.3                      -->
-   <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-   <bean id="primitive_input_msgLsnrCntnr_Meeting_1.3_getMeta"
-         class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
-
-     <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="1"/>
-
-     <!--    input Queue     -->
-     <property name="destination" ref="inQ_Meeting_1.3"/>
-
-     <!-- POJO to delegate JMS Messages to -->
-     <property name="messageListener" ref="primitive_input_q_listenerID_Meeting_1.3"/>
-      <property name="connectionFactory" ref="controllerJmsFactory"/>
-      <property name="messageSelector" value="Command=2001"/>
-   </bean>
-
-   <!-- ================================== -->
-   <!-- OutputChannel - for flows out of   -->
-   <!-- this component, both to delegates  -->
-   <!--  (if aggr) and back up to sender   -->
-   <!-- ================================== -->
-   <bean id="outChnl_Meeting_1.3"
-         class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
-         init-method="initialize">
-      <property name="serviceInputEndpoint" value="inQ_Meeting_1.3"/>
-      <property name="controller" ref="primitive_ctlr_Meeting_1.3"/>
    </bean>
 </beans>
\ No newline at end of file

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml?rev=702261&r1=702260&r2=702261&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml Mon Oct  6 14:01:48 2008
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--==================================================================================-->
  <!-- Generated from                                                                                  -->
- <!-- file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAeMultInstance.xml -->
- <!-- 19 March, 2008, 3:16:01 P.M.                                                                           -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAEMultInstance.xml -->
+ <!-- 6 October, 2008, 4:40:00 P.M.                                                                      -->
  <!--==================================================================================-->
  <!DOCTYPE beans
   PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -27,7 +27,7 @@
       <constructor-arg index="0" ref="resourceManager"/>
 
      <!-- Defines how many CASes will be in the CAS pool -->
-     <property name="casPoolSize" value="40"/>
+     <property name="casPoolSize" value="40"/>
 
      <!-- Initial heap size for CASes  -->
      <property name="initialFsHeapSize" value="2000000"/>
@@ -76,7 +76,7 @@
      <!--      Key name      -->
      <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
       <constructor-arg index="2"
-                       value="file:/C:/a/Eclipse/3.3/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+                       value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
       <constructor-arg index="3" ref="casManager"/>
       <constructor-arg index="4" ref="inProcessCache"/>
 
@@ -84,7 +84,7 @@
      <constructor-arg index="5" value="10"/>
 
      <!-- scaleout number of instances -->
-     <constructor-arg index="6" value="40"/>
+     <constructor-arg index="6" value="40"/>
       <property name="outputChannel" ref="outChnl_RoomNumberAnnotatorQueue_1"/>
       <property name="errorHandlerChain" ref="err_hdlr_chn_RoomNumberAnnotatorQueue_1"/>
    </bean>
@@ -92,9 +92,9 @@
    <!-- ThreadPool Task Executor -->
    <bean id="pooling_RoomNumberAnnotatorQueue_1"
          class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
-      <property name="corePoolSize" value="40"/>
-      <property name="maxPoolSize" value="40"/>
-      <property name="queueCapacity" value="40"/>
+      <property name="corePoolSize" value="40"/>
+      <property name="maxPoolSize" value="40"/>
+      <property name="queueCapacity" value="40"/>
    </bean>
  
    <!--============================================================-->
@@ -140,7 +140,7 @@
      <property name="taskExecutor" ref="pooling_RoomNumberAnnotatorQueue_1"/>
 
      <!-- Define number of JMS Consumers -->
-     <property name="concurrentConsumers" value="40"/>
+     <property name="concurrentConsumers" value="40"/>
 
      <!--    input Queue     -->
      <property name="destination" ref="top_level_input_queue_service_1"/>

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml?rev=702261&r1=702260&r2=702261&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml Mon Oct  6 14:01:48 2008
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--=============================================================================-->
  <!-- Generated from                                                              -->
- <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq1AE.xml -->
- <!-- 25 August, 2008, 1:56:17 P.M.                                               -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AE.xml -->
+ <!-- 6 October, 2008, 4:43:28 P.M.                                               -->
  <!--=============================================================================-->
  <!DOCTYPE beans
   PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">