You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/08/25 23:00:15 UTC
svn commit: r688880 [1/3] - 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/deploy/expected/envVar/
test/resources/descript...
Author: schor
Date: Mon Aug 25 14:00:14 2008
New Revision: 688880
URL: http://svn.apache.org/viewvc?rev=688880&view=rev
Log:
[UIMA-1146] remove (deprecate) the replyQueue element. Add 3 scaleout numbers, per the Jira. New test cases.
Added:
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/iq1AE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/iq2AE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/iq2AEg.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/iq2AEg2.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/iq3.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml
Modified:
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/defaultingAE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/tempQ1.xml
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl Mon Aug 25 14:00:14 2008
@@ -51,6 +51,7 @@
12/10/2007 add check for inconsistency - disallow remote delegate specifying
vm://localhost as the brokerURL broker
11/xx/2007 NOT YET DONE rename pool elements for consistency between cas multiplier and main cas pool
+ further updates moved to SVN comments
-->
<!--============================================================-->
@@ -88,7 +89,7 @@
<xsl:param name="useRelativePaths"/>
- <xsl:param name="noTempQueues" select="()"/>
+ <!--xsl:param name="noTempQueues" select="()"/--> <!-- not used anymore -->
<xsl:variable name="document-uri" select="document-uri(.)"/>
@@ -109,12 +110,17 @@
]">
<xsl:sequence select="."/>
</xsl:for-each-group-->
- <xsl:for-each-group group-by="@brokerURL"
- select="$ddd//u:inputQueue
- [ @brokerURL ne 'vm://localhost' and
+
+ <!-- inputQueue elements occur at the top and within remote delegates
+ get the unique set of elements
+ The code for the first select used to include this "and" clause
+ and
(not(ancestor::u:delegates) or
(../u:replyQueue/@location eq 'remote'))
- ]">
+ -->
+ <xsl:for-each-group group-by="@brokerURL"
+ select="$ddd//u:inputQueue
+ [ @brokerURL ne 'vm://localhost' ]">
<!--xsl:message select="('*** ', ..)"/-->
<xsl:sequence select="."/>
</xsl:for-each-group>
@@ -418,8 +424,7 @@
value="{if ($remoteAnalysisEngine) then $remoteAnalysisEngine/u:inputQueue/@endpoint
else f:getInternalInputQueueName($aeDelegate)}"/>
- <xsl:if test="$remoteAnalysisEngine/u:replyQueue[@location eq 'remote'] and
- not(f:isRmtTempQ($remoteAnalysisEngine))">
+ <xsl:if test="$remoteAnalysisEngine">
<xsl:sequence
select="f:generateLineComment('Queue name used for replies, on the remote broker',5)"/>
<property name="replyToEndpoint"
@@ -457,9 +462,9 @@
value="{$remoteAnalysisEngine/serializer/@method}"/>
</xsl:if>
- <xsl:if test="f:isRmtTempQ($remoteAnalysisEngine)">
+ <!--xsl:if test="(f:isRmtTempQ$remoteAnalysisEngine)"-->
<property name="tempReplyDestination" value="true"/>
- </xsl:if>
+ <!--/xsl:if-->
<!--
<xsl:variable name="msgListenerContainerID"
select="concat('asAggr_return_msgLsnrCntnr_', $aeNameUnique,
@@ -481,7 +486,8 @@
<!-- used as 1st part of ctlr name -->
<xsl:with-param name="msgHandlerChainID"
select="f:getMetaMsgHandlerID(., 'aggregate_input')"/>
- <xsl:with-param name="nbrConcurrentConsumers" select="'1'"/>
+ <xsl:with-param name="nbrConcurrentConsumers" select=
+ "if (f:isTopLevelAggr($input_q_ID)) then string(@inputQueueScaleout) else '1'"/>
<xsl:with-param name="remote" select="()"/>
<xsl:with-param name="poolingTaskExecutor" select="()"/>
</xsl:call-template>
@@ -512,7 +518,7 @@
<!-- used as 1st part of ctlr name -->
<xsl:with-param name="msgHandlerChainID"
select="f:getMetaMsgHandlerID($analysisEngine, 'aggregate_return')"/>
- <xsl:with-param name="nbrConcurrentConsumers" select="'1'"/>
+ <xsl:with-param name="nbrConcurrentConsumers" select="string(@internalReplyQueueScaleout)"/>
<xsl:with-param name="remote" select="()"/>
<xsl:with-param name="poolingTaskExecutor" select="()"/>
</xsl:call-template>
@@ -520,18 +526,18 @@
<!-- we iterate over all the delegates in order to have the right value for position() -->
<xsl:for-each select="u:delegates/*">
- <xsl:if test="self::u:remoteAnalysisEngine[u:replyQueue/@location eq 'remote']">
+ <xsl:if test="self::u:remoteAnalysisEngine">
<!--xsl:message select="('delegate', .)"/-->
<xsl:variable name="returnQ_ID" select="f:getRemoteReturnQueueID($analysisEngine, .)"/>
<xsl:variable name="returnQ_ID_GUID" select="f:getRemoteReturnQueueName($analysisEngine, .)"/>
- <xsl:if test="not(f:isRmtTempQ(.))">
+ <!--xsl:if test="not(f:isRmtTempQ(.))"-->
<xsl:sequence
select="f:generateLineComment(('return queue for http or tcp remote service', 'on remote broker'), 3)"/>
<bean id="{$returnQ_ID}" class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0" value="{$returnQ_ID_GUID}"/>
</bean>
- </xsl:if>
+ <!--/xsl:if-->
<xsl:variable name="brokerID" select="f:getQbrokerID(u:inputQueue)"/>
<!--xsl:message select="('generating input channel for remote reply queue', u:remoteAnalysisEngine/@key)"/-->
@@ -539,16 +545,19 @@
<xsl:with-param name="aeNameUnique" select="$aeNameUnique"/>
<xsl:with-param name="q_ID" select="$returnQ_ID"/>
<!-- if tempQ, use endpoint bean id instead of endpoint name in next parm -->
- <xsl:with-param name="q_endpointName"
+ <!--xsl:with-param name="q_endpointName"
select="if (f:isRmtTempQ(.)) then f:getEndpointName(@key, concat($uniq, '.', position()))
- else $returnQ_ID_GUID"/>
+ else $returnQ_ID_GUID"/-->
+ <xsl:with-param name="q_endpointName"
+ select="f:getEndpointName(@key, concat($uniq, '.', position()))"/>
<xsl:with-param name="queueFactoryID" select="$brokerID"/>
<xsl:with-param name="inputOrReturn" select="'return'"/>
<xsl:with-param name="kind" select="'asAggr'"/>
<!-- used as 1st part of ctlr name -->
<xsl:with-param name="msgHandlerChainID"
select="f:getMetaMsgHandlerID($analysisEngine, 'aggregate_return')"/>
- <xsl:with-param name="nbrConcurrentConsumers" select="'1'"/>
+ <xsl:with-param name="nbrConcurrentConsumers"
+ select="@remoteReplyQueueScaleout"/>
<xsl:with-param name="remote" select="."/>
<xsl:with-param name="poolingTaskExecutor" select="()"/>
</xsl:call-template>
@@ -732,6 +741,7 @@
<xsl:with-param name="poolingTaskExecutor" select="$poolingTaskExecutorID"/>
</xsl:call-template>
+ <!-- next to be commented out due to design change summer 2008 -->
<xsl:if test="parent::u:service and u:casMultiplier">
<xsl:call-template name="generateCMSyncInputChannel">
<xsl:with-param name="aeNameUnique" select="$aeNameUnique"/>
@@ -942,7 +952,8 @@
<bean id="{$q_listenerID}"
class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
<property name="messageHandler" ref="{$msgHandlerChainID}"/>
- <property name="endpointName" value="{if (f:isRmtTempQ($remote)) then '' else $q_endpointName}"/>
+ <!--property name="endpointName" value="{if (f:isRmtTempQ($remote)) then '' else $q_endpointName}"/-->
+ <property name="endpointName" value="{if ($remote[self::u:remoteAnalysisEngine]) then '' else $q_endpointName}"/>
<property name="controller" ref="{$ctlrID}"/>
<xsl:if test="$inputOrReturn eq 'input'">
<property name="listenerContainer" ref="{$msgListenerContainerID}"/>
@@ -967,7 +978,7 @@
<xsl:sequence select="f:generateLineComment(concat($inputOrReturn, ' Queue'), 5)"/>
<xsl:choose>
- <xsl:when test="f:isRmtTempQ($remote)">
+ <xsl:when test="$remote[self::u:remoteAnalysisEngine]">
<property name="destinationResolver" ref="{f:getDestinationResolverID($aeNameUnique, $remote/@key)}"/>
<property name="destinationName" value="" />
<property name="targetEndpoint" ref="{$q_endpointName}" />
@@ -986,7 +997,7 @@
</xsl:if>
</bean>
- <xsl:if test="f:isRmtTempQ($remote)">
+ <xsl:if test="$remote[self::u:remoteAnalysisEngine]">
<xsl:sequence select="f:generateLineComment((
'~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~',
concat('Destination Resolver for ',$remote/@key),
@@ -1036,6 +1047,8 @@
<!--================================================-->
<!-- Generate a Cas Multiplier Sync input Channel -->
<!--================================================-->
+
+ <!-- note: NO LONGER USED as of UIMA-1019 design change -->
<xsl:template name="generateCMSyncInputChannel">
<xsl:param name="aeNameUnique"/>
<xsl:param name="q_ID"/> <!-- this is a descriptor-unique bean id of the input (or ret) q endpoint -->
@@ -1590,8 +1603,42 @@
('deployment descriptor for AE:', $key,
'has delegate?', if (u:delegates) then 'true' else 'false',
'async is:', $async), .)"/-->
+
+ <xsl:variable name="internalReplyQueueScaleout" as="xs:string">
+ <xsl:choose>
+ <xsl:when test="(string($async) = 'false') and @internalReplyQueueScaleout">
+ <xsl:sequence select="f:msgWithLineNumber('WARN',
+ ('deployment descriptor for analysisEngine:', $key,
+ 'specifies', concat('internalReplyQueueScaleout="', string(@internalReplyQueueScaleout),
+ '", this is ignored for async="false" analysisEngine specifications.')),
+ .)"/>
+ <xsl:value-of select="'1'"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:sequence select="if (@internalReplyQueueScaleout) then @internalReplyQueueScaleout else '1'"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="inputQueueScaleout" as="xs:string">
+ <xsl:choose>
+ <xsl:when test="(string($async) = 'false') and @inputQueueScaleout">
+ <xsl:sequence select="f:msgWithLineNumber('WARN',
+ ('deployment descriptor for analysisEngine:', $key,
+ 'specifies', concat('inputQueueScaleout="', string(@inputQueueScaleout),
+ '", this is ignored for async="false" analysisEngine specifications.')),
+ .)"/>
+ <xsl:value-of select="'1'"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:sequence select="if (@inputQueueScaleout) then @inputQueueScaleout else '1'"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
- <u:analysisEngine key="{$key}" async="{$async}">
+ <u:analysisEngine key="{$key}" async="{$async}"
+ internalReplyQueueScaleout="{$internalReplyQueueScaleout}"
+ inputQueueScaleout ="{$inputQueueScaleout}">
<i:local_ae_descriptor file_path="{$local_ae_descriptor_file_path[1]}">
<!--xsl:message select="'local_ae_descriptor'"/>
@@ -1947,8 +1994,12 @@
<xsl:template mode="addDefaults" match="u:remoteDelegate|u:remoteAnalysisEngine">
<xsl:param tunnel="yes" name="defaultErrorConfig"/>
<!--xsl:message select="'*** remote delegate defaulting pass 1 called '"/-->
- <!--xsl:sequence select="f:validate(.)"/-->
- <u:remoteAnalysisEngine key="{@key}">
+ <!--xsl:sequence select="f:validate(.)"/-->
+
+ <xsl:variable name="remoteReplyQueueScaleout" as="xs:string"
+ select="if (@remoteReplyQueueScaleout) then @remoteReplyQueueScaleout else '1'"/>
+
+ <u:remoteAnalysisEngine key="{@key}" remoteReplyQueueScaleout="{$remoteReplyQueueScaleout}">
<xsl:if test="u:casMultiplier">
<u:casMultiplier poolSize="{if (u:casMultiplier/@poolSize) then u:casMultiplier/@poolSize else '1'}"
initialFsHeapSize="{if (u:casMultiplier/@initialFsHeapSize) then u:casMultiplier/@initialFsHeapSize else '2000000'}"/>
@@ -1962,7 +2013,9 @@
<xsl:choose>
<xsl:when test="u:replyQueue">
- <xsl:if test="not(u:replyQueue/@location = ('local', 'remote'))">
+ <xsl:sequence select="f:msgWithLineNumber('WARNING',
+ ('replyQueue element no longer used - all reply queues are remote for remote delegates'), u:replyQueue)"/>
+ <!--xsl:if test="not(u:replyQueue/@location = ('local', 'remote')) and u:replyQueue/@location">
<xsl:sequence select="f:msgWithLineNumber('ERROR',
('replyQueue location attribute, ', u:replyQueue/@location, ', must have a value of either ''local'' or ''remote'''), u:replyQueue)"/>
</xsl:if>
@@ -1971,12 +2024,19 @@
<xsl:sequence select="f:msgWithLineNumber('ERROR',
'''local'' replyQueue location is not supported for ''http://'' style connections', u:replyQueue)"/>
</xsl:if>
- <u:replyQueue location="{if (u:replyQueue/@location) then u:replyQueue/@location else
- if (starts-with($tmp/u:inputQueue/@brokerURL, 'http://')) then 'remote' else 'local'}"/>
+ <xsl:if test="(u:replyQueue/@location eq 'local')">
+ <xsl:sequence select="f:msgWithLineNumber('ERROR',
+ '''local'' replyQueue location is no longer supported and will be forcedto remote', u:replyQueue)"/>
+ </xsl:if-->
+ <!--u:replyQueue location="{if (u:replyQueue/@location) then u:replyQueue/@location else
+ if (starts-with($tmp/u:inputQueue/@brokerURL, 'http://')) then 'remote' else 'local'}"/-->
+ <!--u:replyQueue location="remote" concurrentConsumers=
+ "{if (u:replyQueue/@concurrentConsumers) then u:replyQueue/@concurrentConsumers else '1'}"/-->
</xsl:when>
<xsl:otherwise>
- <u:replyQueue location="{
- if (starts-with($tmp/u:inputQueue/@brokerURL, 'http://')) then 'remote' else 'local'}"/>
+ <!--u:replyQueue location="remote" concurrentConsumers="1"/-->
+ <!--u:replyQueue location="{
+ if (starts-with($tmp/u:inputQueue/@brokerURL, 'http://')) then 'remote' else 'local'}"/-->
<!--xsl:message select="('*** replyQueue',
if (starts-with($tmp/u:inputQueue/@brokerURL, 'http://')) then 'remote' else 'local')"/-->
</xsl:otherwise>
@@ -2090,15 +2150,15 @@
</xsl:choose>
</xsl:function>
- <xsl:function name="f:isRmtTempQ">
- <xsl:param name="rmtNode"/>
+ <!--xsl:function name="f:isRmtTempQ">
+ <xsl:param name="rmtNode"/-->
<!--xsl:message select="not($noTempQueues) and
($rmtNode/u:replyQueue/@location eq 'remote') and
($topLevelInputQueueBroker ne 'vm://localhost') and
($rmtNode/u:inputQueue/@brokerURL eq $topLevelInputQueueBroker)"/-->
- <xsl:sequence select="not($noTempQueues) and
+ <!--xsl:sequence select="not($noTempQueues) and
($rmtNode/u:replyQueue/@location eq 'remote')"/>
- </xsl:function>
+ </xsl:function-->
<xsl:function name="f:isAggr">
<xsl:param name="aeNode"/>
@@ -2109,6 +2169,11 @@
<xsl:param name="aeNode"/>
<xsl:sequence select="$aeNode/*/u:frameworkImplementation[text() eq 'org.apache.uima.cpp']"/>
</xsl:function>
+
+ <xsl:function name="f:isTopLevelAggr">
+ <xsl:param name="qname"/>
+ <xsl:sequence select="starts-with($qname, 'top_level_input_queue_service')"/>
+ </xsl:function>
<xsl:function name="f:getUserHandlerDispatcherID">
<xsl:param name="node"/>
@@ -2464,7 +2529,9 @@
<u:environmentVariables i:maxone="">
<u:environmentVariable name=""/>
</u:environmentVariables>
- <u:analysisEngine i:maxone="" key="" async="">
+ <u:analysisEngine i:maxone="" key="" async=""
+ internalReplyQueueScaleout=""
+ inputQueueScaleout="">
<u:scaleout i:maxone="" numberOfInstances=""/>
<u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize=""/>
<u:asyncPrimitiveErrorConfiguration i:maxone="">
@@ -2480,7 +2547,7 @@
</u:asyncAggregateErrorConfiguration>
<u:delegates i:maxone="">
<u:analysisEngine/>
- <u:remoteAnalysisEngine key="">
+ <u:remoteAnalysisEngine key="" remoteReplyQueueScaleout="">
<u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize=""/>
<u:inputQueue i:maxone="" i:required="" brokerURL="" endpoint="" queueName=""/>
<u:replyQueue i:maxone="" location=""/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java Mon Aug 25 14:00:14 2008
@@ -49,7 +49,8 @@
// get rid of uniqifiers that are generated
private static String uniquifiersPattern =
// sample: 9.67.165.27-44fb4c2a:1165912164d:-8000
- "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.[\\-0-9a-fA-F]{9,12}\\:[0-9a-fA-F]{8,12}"
+ // another: 9.2.34.65754d945a:11bfaf7fad7:-7fff
+ "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.?[\\-0-9a-fA-F]{6,12}\\:[0-9a-fA-F]{8,12}\\:\\-[0-9a-fA-F]{4,4}"
;
// get rid of part of file name that is system specific
@@ -89,6 +90,30 @@
}
+ public void testDd2Spring_inputQueueScaleout3() throws Exception {
+ checkDd2Spring("iq3.xml");
+ }
+
+ public void testDd2Spring_inputQueueScaleout2g2() throws Exception {
+ checkDd2Spring("iq2AEg2.xml");
+ }
+
+ public void testDd2Spring_inputQueueScaleout2g() throws Exception {
+ checkDd2Spring("iq2AEg.xml");
+ }
+
+ public void testDd2Spring_inputQueueScaleout2() throws Exception {
+ checkDd2Spring("iq2AE.xml");
+ }
+
+ public void testDd2Spring_inputQueueScaleout1() throws Exception {
+ checkDd2Spring("iq1AE.xml");
+ }
+
+ public void testDd2Spring_concurRemoteConsumers() throws Exception {
+ checkDd2Spring("aggrRmtConcurrentReply.xml");
+ }
+
public void testDd2Spring_multiLevelAsyncDefaulting() throws Exception {
checkDd2Spring("Deploy_MeetingFinder.xml");
}
@@ -104,7 +129,7 @@
public void testDd2Spring_NotCPP() throws Exception {
checkDd2SpringErrMsg(
"envVar/envVarNotCPP.xml",
- "\n *** ERROR: line-number: 28 Service element contains an environmentVariables element, \n" +
+ "running test envVar/envVarNotCPP.xml: \n *** ERROR: line-number: 28 Service element contains an environmentVariables element, \n" +
" but the referenced top-level descriptor isn't a C++ component");
}
@@ -131,7 +156,7 @@
public void testDd2Spring_CPPwrongProtocol() throws Exception {
checkDd2SpringErrMsg(
"envVar/envVarCPPwrongProtocol.xml",
- "\n *** ERROR: line-number: 28 top level input Queue broker protocol must be tcp:// for a top level C++ component");
+ "running test envVar/envVarCPPwrongProtocol.xml: \n *** ERROR: line-number: 28 top level input Queue broker protocol must be tcp:// for a top level C++ component");
}
@@ -151,7 +176,7 @@
}
private void checkDd2Spring(String dd) throws Exception {
-
+ System.err.print("running test " + dd + ": ");
File springContextFile =
dd2SpringInstance.convertDd2Spring(pathToDds + dd, dd2SpringXsltFilePath, saxonClasspath, "");
Added: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml?rev=688880&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml (added)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml Mon Aug 25 14:00:14 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ ***************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ***************************************************************
+ -->
+<!-- test concurrent reply consumer -->
+<analysisEngineDeploymentDescription
+ xmlns="http://uima.apache.org/resourceSpecifier">
+ <name>Meeting Detector TAE</name>
+ <deployment protocol="jms" provider="activemq">
+ <casPool numberOfCASes="5"/>
+
+ <service>
+ <inputQueue endpoint="RoomNumberAnnotatorQueue"
+ brokerURL="tcp://localhost:61616"/>
+ <topDescriptor>
+ <import
+ location="../descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ </topDescriptor>
+ <analysisEngine async="true">
+ <delegates>
+ <remoteAnalysisEngine key="DateTime" remoteReplyQueueScaleout="31">
+ <inputQueue endpoint="iq1" brokerURL="tcp://some.remote:12345"/>
+ </remoteAnalysisEngine>
+ </delegates>
+ </analysisEngine>
+ </service>
+
+ </deployment>
+</analysisEngineDeploymentDescription>
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/defaultingAE.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/defaultingAE.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/defaultingAE.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/defaultingAE.xml Mon Aug 25 14:00:14 2008
@@ -32,6 +32,7 @@
<import
location="../descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
</topDescriptor>
+ <analysisEngine async="false" inputQueueScaleout="3"/>
</service>
</deployment>
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=688880&r1=688879&r2=688880&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 Aug 25 14:00:14 2008
@@ -51,7 +51,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
@@ -200,6 +200,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!-- ==================================== -->
@@ -219,6 +220,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="100000"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!-- ==================================== -->
@@ -238,6 +240,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!-- ==================================== -->
@@ -256,6 +259,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
Added: 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=688880&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml (added)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml Mon Aug 25 14:00:14 2008
@@ -0,0 +1,737 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml -->
+ <!-- 4 August, 2008, 4:59:18 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"
+ class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="prefetchPolicy" ref="prefetchPolicy"/>
+ </bean>
+
+ <!-- Factory for specific external queue broker: -->
+ <!-- tcp://some.remote:12345 -->
+ <bean id="qBroker_tcp_c__ss_some.remote_c_12345"
+ class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://some.remote:12345"/>
+ <property name="prefetchPolicy" ref="prefetchPolicy"/>
+ </bean>
+
+ <!-- Creates an instance of the ResourceManager -->
+ <bean id="resourceManager" class="org.apache.uima.aae.UimaClassFactory"
+ factory-method="produceResourceManager"
+ singleton="true"/>
+
+ <!-- Creates an instance of the CasManager -->
+ <bean id="casManager" class="org.apache.uima.aae.AsynchAECasManager_impl"
+ singleton="true">
+ <constructor-arg index="0" ref="resourceManager"/>
+
+ <!-- Defines how many CASes will be in the CAS pool -->
+ <property name="casPoolSize" value="5"/>
+
+ <!-- Initial heap size for CASes -->
+ <property name="initialFsHeapSize" value="2000000"/>
+ </bean>
+
+ <!-- Creates a Shared Cache -->
+ <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
+
+ <!-- Create prefetch policy -->
+ <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 -->
+ <!--=================================-->
+ <bean id="errorConfig__TCnt_0_TWndw_0_Action_"
+ class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="threshold" value="0"/>
+ <property name="window" value="0"/>
+ <property name="action" value=""/>
+ </bean>
+
+ <bean id="errorConfig__Action_" class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="action" value=""/>
+ </bean>
+
+ <bean id="errorConfig__Rtry_0_Action_terminate"
+ class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="maxRetries" value="0"/>
+ <property name="action" value="terminate"/>
+ </bean>
+
+ <bean id="errorConfig__Rtry_0_Continue_false_TCnt_0_TWndw_0_Action_"
+ class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="maxRetries" value="0"/>
+ <property name="continueOnRetryFailure" value="false"/>
+ <property name="threshold" value="0"/>
+ <property name="window" value="0"/>
+ <property name="action" value=""/>
+ </bean>
+
+
+ <!--input queue for service-->
+ <bean id="top_level_input_queue_service_1"
+ class="org.apache.activemq.command.ActiveMQQueue">
+ <constructor-arg index="0" value="RoomNumberAnnotatorQueue"/>
+ </bean>
+ <!--=============================================-->
+ <!-- Async Aggregate: RoomNumberAnnotatorQueue_1 -->
+ <!--=============================================-->
+ <bean id="asAggr_ctlr_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.controller.AggregateAnalysisEngineController_impl"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <null/>
+ </constructor-arg>
+ <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
+ <constructor-arg index="2"
+ 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"/>
+ <property name="outputChannel" ref="outChnl_RoomNumberAnnotatorQueue_1"/>
+ <property name="serviceEndpointName" value="top_level_input_queue_service_1"/>
+ <property name="controllerBeanName" value="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+ <property name="errorHandlerChain" ref="err_hdlr_chn_RoomNumberAnnotatorQueue_1"/>
+ <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_RoomNumberAnnotatorQueue_1 -->
+ <!--=========================================================-->
+
+ <bean id="aggregate_input_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_input_processRequestHandler_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <bean id="aggregate_input_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>
+
+ <!--=========================================================-->
+ <!-- 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 -->
+
+
+ <!-- ==================================== -->
+ <!-- RoomNumber -->
+ <!-- ** Delegate Endpoint ** -->
+ <!-- ==================================== -->
+ <bean id="endpt_RoomNumber_1.1" class="org.apache.uima.aae.controller.Endpoint_impl">
+
+ <!-- Broker URI -->
+ <property name="serverURI" value="vm://localhost"/>
+
+ <!-- Delegate key name or remote queue name -->
+ <property name="endpoint" value="inQ_RoomNumber_1.1"/>
+
+ <!-- Timeouts -->
+ <property name="metadataRequestTimeout" value="60000"/>
+ <property name="processRequestTimeout" value="0"/>
+ <property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
+ </bean>
+
+ <!-- ==================================== -->
+ <!-- DateTime -->
+ <!-- ** Delegate Endpoint ** -->
+ <!-- ==================================== -->
+ <bean id="endpt_DateTime_1.2" class="org.apache.uima.aae.controller.Endpoint_impl">
+
+ <!-- Broker URI -->
+ <property name="serverURI" value="tcp://some.remote:12345"/>
+
+ <!-- Delegate key name or remote queue name -->
+ <property name="endpoint" value="iq1"/>
+
+ <!-- Queue name used for replies, on the remote broker -->
+ <property name="replyToEndpoint"
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.34.65-ec420e1:11bfae8a82b:-8000"/>
+
+ <!-- Timeouts -->
+ <property name="metadataRequestTimeout" value="60000"/>
+ <property name="processRequestTimeout" value="0"/>
+ <property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="serializer" value=""/>
+ <property name="tempReplyDestination" value="true"/>
+ </bean>
+
+ <!-- ==================================== -->
+ <!-- Meeting -->
+ <!-- ** Delegate Endpoint ** -->
+ <!-- ==================================== -->
+ <bean id="endpt_Meeting_1.3" class="org.apache.uima.aae.controller.Endpoint_impl">
+
+ <!-- Broker URI -->
+ <property name="serverURI" value="vm://localhost"/>
+
+ <!-- Delegate key name or remote queue name -->
+ <property name="endpoint" value="inQ_Meeting_1.3"/>
+
+ <!-- Timeouts -->
+ <property name="metadataRequestTimeout" value="60000"/>
+ <property name="processRequestTimeout" value="0"/>
+ <property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- JMS msg listener for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="asAggr_input_q_listenerID_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
+ <property name="messageHandler"
+ ref="aggregate_input_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
+ <property name="endpointName" value="top_level_input_queue_service_1"/>
+ <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+ <property name="listenerContainer"
+ ref="asAggr_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- JMS msg listener container for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="asAggr_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
+
+ <!-- Define number of JMS Consumers -->
+ <property name="concurrentConsumers" value="1"/>
+
+ <!-- input Queue -->
+ <property name="destination" ref="top_level_input_queue_service_1"/>
+
+ <!-- POJO to delegate JMS Messages to -->
+ <property name="messageListener"
+ ref="asAggr_input_q_listenerID_RoomNumberAnnotatorQueue_1"/>
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_localhost_c_61616"/>
+ <property name="messageSelector" value="Command=2000 OR Command=2002"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- GetMeta JMS msg listener container for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="asAggr_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_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="top_level_input_queue_service_1"/>
+
+ <!-- POJO to delegate JMS Messages to -->
+ <property name="messageListener"
+ ref="asAggr_input_q_listenerID_RoomNumberAnnotatorQueue_1"/>
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_localhost_c_61616"/>
+ <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"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <!-- JMS msg listener for return queue for: -->
+ <!-- rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <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"/>
+ <property name="endpointName" value=""/>
+ <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <!-- JMS msg listener container for return queue for: -->
+ <!-- rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <bean id="asAggr_return_msgLsnrCntnr_RoomNumberAnnotatorQueue_1_DateTime"
+ class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
+
+ <!-- Define number of JMS Consumers -->
+ <property name="concurrentConsumers" value="31"/>
+
+ <!-- return Queue -->
+ <property name="destinationResolver"
+ ref="destinationResolver_RoomNumberAnnotatorQueue_1_DateTime"/>
+ <property name="destinationName" value=""/>
+ <property name="targetEndpoint" ref="endpt_DateTime_1.2"/>
+
+ <!-- POJO to delegate JMS Messages to -->
+ <property name="messageListener"
+ ref="asAggr_return_q_listenerID_RoomNumberAnnotatorQueue_1_DateTime"/>
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_some.remote_c_12345"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <!-- Destination Resolver for DateTime -->
+ <!-- rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ <bean id="destinationResolver_RoomNumberAnnotatorQueue_1_DateTime"
+ class="org.apache.uima.adapter.jms.activemq.TempDestinationResolver"
+ singleton="false">
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_some.remote_c_12345"/>
+ </bean>
+
+ <!-- ================================== -->
+ <!-- OutputChannel - for flows out of -->
+ <!-- this component, both to delegates -->
+ <!-- (if aggr) and back up to sender -->
+ <!-- ================================== -->
+ <bean id="outChnl_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
+ init-method="initialize">
+ <property name="serviceInputEndpoint" value="RoomNumberAnnotatorQueue"/>
+ <property name="controller" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+ <property name="controllerInputEndpoint" value="asynAggr_retQ_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!-- map for delegate keys -->
+ <bean id="delegate_map_RoomNumberAnnotatorQueue_1" class="java.util.HashMap"
+ singleton="true">
+ <constructor-arg>
+ <map>
+ <entry key="RoomNumber">
+ <ref bean="endpt_RoomNumber_1.1"/>
+ </entry>
+ <entry key="DateTime">
+ <ref bean="endpt_DateTime_1.2"/>
+ </entry>
+ <entry key="Meeting">
+ <ref bean="endpt_Meeting_1.3"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <!--========================-->
+ <!-- Delegate ErrorHandlers -->
+ <!--========================-->
+ <bean id="err_hndlr_getMetadataEr_1"
+ class="org.apache.uima.aae.error.handler.GetMetaErrorHandler">
+ <constructor-arg>
+ <map>
+ <entry key="RoomNumber">
+ <ref bean="errorConfig__Rtry_0_Action_terminate"/>
+ </entry>
+ <entry key="DateTime">
+ <ref bean="errorConfig__Rtry_0_Action_terminate"/>
+ </entry>
+ <entry key="Meeting">
+ <ref bean="errorConfig__Rtry_0_Action_terminate"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="err_hndlr_processCasEr_1"
+ class="org.apache.uima.aae.error.handler.ProcessCasErrorHandler">
+ <constructor-arg>
+ <map>
+ <entry key="RoomNumber">
+ <ref bean="errorConfig__Rtry_0_Continue_false_TCnt_0_TWndw_0_Action_"/>
+ </entry>
+ <entry key="DateTime">
+ <ref bean="errorConfig__Rtry_0_Continue_false_TCnt_0_TWndw_0_Action_"/>
+ </entry>
+ <entry key="Meeting">
+ <ref bean="errorConfig__Rtry_0_Continue_false_TCnt_0_TWndw_0_Action_"/>
+ </entry>
+ <entry key="">
+ <ref bean="errorConfig__TCnt_0_TWndw_0_Action_"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="err_hndlr_collectionProcessCompleteEr_1"
+ class="org.apache.uima.aae.error.handler.CpcErrorHandler">
+ <constructor-arg>
+ <map>
+ <entry key="RoomNumber">
+ <ref bean="errorConfig__Action_"/>
+ </entry>
+ <entry key="DateTime">
+ <ref bean="errorConfig__Action_"/>
+ </entry>
+ <entry key="Meeting">
+ <ref bean="errorConfig__Action_"/>
+ </entry>
+ <entry key="">
+ <ref bean="errorConfig__Action_"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <!--=======================-->
+ <!-- Error Handler Chain -->
+ <!--=======================-->
+ <bean id="err_hdlr_chn_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.error.ErrorHandlerChain">
+ <constructor-arg>
+ <list>
+ <ref local="err_hndlr_getMetadataEr_1"/>
+ <ref local="err_hndlr_processCasEr_1"/>
+ <ref local="err_hndlr_collectionProcessCompleteEr_1"/>
+ </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 -->
+ <!--=========================================-->
+ <bean id="primitive_ctlr_RoomNumber_1.1"
+ class="org.apache.uima.aae.controller.PrimitiveAnalysisEngineController_impl"
+ init-method="initialize">
+ <constructor-arg index="0" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+
+ <!-- Key name -->
+ <constructor-arg index="1" value="RoomNumber"/>
+ <constructor-arg index="2"
+ 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"/>
+
+ <!-- this parameter is ignored -->
+ <constructor-arg index="5" value="10"/>
+
+ <!-- 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 -->
+ <!--======================================-->
+ <bean id="primitive_ctlr_Meeting_1.3"
+ class="org.apache.uima.aae.controller.PrimitiveAnalysisEngineController_impl"
+ init-method="initialize">
+ <constructor-arg index="0" ref="asAggr_ctlr_RoomNumberAnnotatorQueue_1"/>
+
+ <!-- Key name -->
+ <constructor-arg index="1" value="Meeting"/>
+ <constructor-arg index="2"
+ 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"/>
+
+ <!-- this parameter is ignored -->
+ <constructor-arg index="5" value="10"/>
+
+ <!-- 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/defaultingAE.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml Mon Aug 25 14:00:14 2008
@@ -38,7 +38,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml Mon Aug 25 14:00:14 2008
@@ -38,7 +38,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
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=688880&r1=688879&r2=688880&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 Aug 25 14:00:14 2008
@@ -51,7 +51,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
@@ -189,6 +189,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!-- ==================================== -->
@@ -207,6 +208,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!-- ==================================== -->
@@ -225,6 +227,7 @@
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
<property name="collectionProcessCompleteTimeout" value="0"/>
+ <property name="tempReplyDestination" value="true"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
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=688880&r1=688879&r2=688880&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 Aug 25 14:00:14 2008
@@ -38,7 +38,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml Mon Aug 25 14:00:14 2008
@@ -27,7 +27,7 @@
<constructor-arg index="3" value="1"/>
<!-- prefetch limit -->
- <constructor-arg index="4" value="1"/>
+ <constructor-arg index="4" value="0"/>
<!-- Env Vars map -->
<constructor-arg index="5">
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml Mon Aug 25 14:00:14 2008
@@ -30,7 +30,7 @@
<constructor-arg index="3" value="1"/>
<!-- prefetch limit -->
- <constructor-arg index="4" value="1"/>
+ <constructor-arg index="4" value="0"/>
<!-- Env Vars map -->
<constructor-arg index="5">
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml Mon Aug 25 14:00:14 2008
@@ -27,7 +27,7 @@
<constructor-arg index="3" value="1"/>
<!-- prefetch limit -->
- <constructor-arg index="4" value="1"/>
+ <constructor-arg index="4" value="0"/>
<!-- Env Vars map -->
<constructor-arg index="5">
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml?rev=688880&r1=688879&r2=688880&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml Mon Aug 25 14:00:14 2008
@@ -38,7 +38,7 @@
<!-- Create prefetch policy -->
<bean id="prefetchPolicy" class="org.apache.activemq.ActiveMQPrefetchPolicy">
- <property name="queuePrefetch" value="1"/>
+ <property name="queuePrefetch" value="0"/>
</bean>
<!--=================================-->
Added: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml?rev=688880&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml (added)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml Mon Aug 25 14:00:14 2008
@@ -0,0 +1,218 @@
+<?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. -->
+ <!--=============================================================================-->
+ <!DOCTYPE beans
+ PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <!-- Factory for specific external queue broker: -->
+ <!-- tcp://localhost:61616 -->
+ <bean id="qBroker_tcp_c__ss_localhost_c_61616"
+ class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616"/>
+ <property name="prefetchPolicy" ref="prefetchPolicy"/>
+ </bean>
+
+ <!-- Creates an instance of the ResourceManager -->
+ <bean id="resourceManager" class="org.apache.uima.aae.UimaClassFactory"
+ factory-method="produceResourceManager"
+ singleton="true"/>
+
+ <!-- Creates an instance of the CasManager -->
+ <bean id="casManager" class="org.apache.uima.aae.AsynchAECasManager_impl"
+ singleton="true">
+ <constructor-arg index="0" ref="resourceManager"/>
+
+ <!-- Defines how many CASes will be in the CAS pool -->
+ <property name="casPoolSize" value="5"/>
+
+ <!-- Initial heap size for CASes -->
+ <property name="initialFsHeapSize" value="2000000"/>
+ </bean>
+
+ <!-- Creates a Shared Cache -->
+ <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
+
+ <!-- Create prefetch policy -->
+ <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 -->
+ <!--=================================-->
+ <bean id="errorConfig__TCnt_0_TWndw_0_Action_"
+ class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="threshold" value="0"/>
+ <property name="window" value="0"/>
+ <property name="action" value=""/>
+ </bean>
+
+ <bean id="errorConfig__Action_" class="org.apache.uima.aae.error.Threshold"
+ singleton="true">
+ <property name="action" value=""/>
+ </bean>
+
+
+ <!--input queue for service-->
+ <bean id="top_level_input_queue_service_1"
+ class="org.apache.activemq.command.ActiveMQQueue">
+ <constructor-arg index="0" value="RoomNumberAnnotatorQueue"/>
+ </bean>
+ <!--=======================================================-->
+ <!-- Primitive or non-Async Aggr: RoomNumberAnnotatorQueue -->
+ <!--=======================================================-->
+ <bean id="primitive_ctlr_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.controller.PrimitiveAnalysisEngineController_impl"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <null/>
+ </constructor-arg>
+
+ <!-- Key name -->
+ <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
+ <constructor-arg index="2"
+ 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"/>
+
+ <!-- this parameter is ignored -->
+ <constructor-arg index="5" value="10"/>
+
+ <!-- scaleout number of instances -->
+ <constructor-arg index="6" value="1"/>
+ <property name="outputChannel" ref="outChnl_RoomNumberAnnotatorQueue_1"/>
+ <property name="errorHandlerChain" ref="err_hdlr_chn_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!-- ThreadPool Task Executor -->
+ <bean id="pooling_RoomNumberAnnotatorQueue_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_RoomNumberAnnotatorQueue_1 -->
+ <!--============================================================-->
+
+ <bean id="primitive_metaMsgHandler_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.handler.input.MetadataRequestHandler_impl">
+ <constructor-arg index="0" value="MetadataRequestHandler"/>
+ <property name="controller" ref="primitive_ctlr_RoomNumberAnnotatorQueue_1"/>
+ <property name="delegate"
+ ref="primitive_processRequestHandler_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <bean id="primitive_processRequestHandler_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.handler.input.ProcessRequestHandler_impl">
+ <constructor-arg index="0" value="ProcessRequestHandler"/>
+ <property name="controller" ref="primitive_ctlr_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- JMS msg listener for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="primitive_input_q_listenerID_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.JmsInputChannel">
+ <property name="messageHandler" ref="primitive_metaMsgHandler_RoomNumberAnnotatorQueue_1"/>
+ <property name="endpointName" value="top_level_input_queue_service_1"/>
+ <property name="controller" ref="primitive_ctlr_RoomNumberAnnotatorQueue_1"/>
+ <property name="listenerContainer"
+ ref="primitive_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- JMS msg listener container for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="primitive_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.UimaDefaultMessageListenerContainer">
+
+ <!-- Connect to pooling task executor for primitive -->
+ <property name="taskExecutor" ref="pooling_RoomNumberAnnotatorQueue_1"/>
+
+ <!-- Define number of JMS Consumers -->
+ <property name="concurrentConsumers" value="1"/>
+
+ <!-- input Queue -->
+ <property name="destination" ref="top_level_input_queue_service_1"/>
+
+ <!-- POJO to delegate JMS Messages to -->
+ <property name="messageListener"
+ ref="primitive_input_q_listenerID_RoomNumberAnnotatorQueue_1"/>
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_localhost_c_61616"/>
+ <property name="messageSelector" value="Command=2000 OR Command=2002"/>
+ </bean>
+
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- GetMeta JMS msg listener container for input queue for: -->
+ <!-- top_level_input_queue_service_1 -->
+ <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <bean id="primitive_input_msgLsnrCntnr_RoomNumberAnnotatorQueue_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="top_level_input_queue_service_1"/>
+
+ <!-- POJO to delegate JMS Messages to -->
+ <property name="messageListener"
+ ref="primitive_input_q_listenerID_RoomNumberAnnotatorQueue_1"/>
+ <property name="connectionFactory" ref="qBroker_tcp_c__ss_localhost_c_61616"/>
+ <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_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.adapter.jms.activemq.JmsOutputChannel"
+ init-method="initialize">
+ <property name="serviceInputEndpoint" value="RoomNumberAnnotatorQueue"/>
+ <property name="controller" ref="primitive_ctlr_RoomNumberAnnotatorQueue_1"/>
+ </bean>
+ <bean id="err_hndlr_processCasEr_"
+ class="org.apache.uima.aae.error.handler.ProcessCasErrorHandler">
+ <constructor-arg>
+ <map>
+ <entry key="">
+ <ref bean="errorConfig__TCnt_0_TWndw_0_Action_"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+ <bean id="err_hndlr_collectionProcessCompleteEr_"
+ class="org.apache.uima.aae.error.handler.CpcErrorHandler">
+ <constructor-arg>
+ <map>
+ <entry key="">
+ <ref bean="errorConfig__Action_"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+ <!--=======================-->
+ <!-- Error Handler Chain -->
+ <!--=======================-->
+ <bean id="err_hdlr_chn_RoomNumberAnnotatorQueue_1"
+ class="org.apache.uima.aae.error.ErrorHandlerChain">
+ <constructor-arg>
+ <list>
+ <ref local="err_hndlr_processCasEr_"/>
+ <ref local="err_hndlr_collectionProcessCompleteEr_"/>
+ </list>
+ </constructor-arg>
+ </bean>
+</beans>
\ No newline at end of file