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 2013/09/18 16:06:12 UTC
svn commit: r1524421 - in /uima/uima-as/trunk/src: main/scripts/
test/resources/deploy/expected/ test/resources/deploy/expected/envVar/
Author: schor
Date: Wed Sep 18 14:06:11 2013
New Revision: 1524421
URL: http://svn.apache.org/r1524421
Log:
[UIMA-2735] add support for disabling the JCasCache to the deployment descriptor, in dd2spring. Update the test cases.
Modified:
uima/uima-as/trunk/src/main/scripts/dd2spring.xsl
uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueueNoBroker.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/TestThresholdWindow.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateCM.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateErMsgKeys.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAE.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAENoBroker.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggr.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEwithBrokerParms.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceDiffCasPool.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceSameCasPool.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/iq1AE.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AE.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg2.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/iq3.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/remoteCasMultiplier.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/remoteSerializer.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/tempQ1.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/var1.xml
uima/uima-as/trunk/src/test/resources/deploy/expected/vmBkrBad.xml
Modified: uima/uima-as/trunk/src/main/scripts/dd2spring.xsl
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/scripts/dd2spring.xsl?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/scripts/dd2spring.xsl (original)
+++ uima/uima-as/trunk/src/main/scripts/dd2spring.xsl Wed Sep 18 14:06:11 2013
@@ -464,6 +464,12 @@
<xsl:if test="$aeDelegate/u:casMultiplier/@processParentLast">
<property name="processParentLast" value="{$aeDelegate/u:casMultiplier/@processParentLast}"/>
</xsl:if>
+
+ <!-- jira UIMA-2735 -->
+ <xsl:if test="$aeDelegate/u:casMultiplier/@disableJCasCache">
+ <property name="disableJCasCache" value="{$aeDelegate/u:casMultiplier/@disableJCasCache}"/>
+ </xsl:if>
+
<xsl:sequence select="f:generateLineComment('Timeouts', 5)"/>
<property name="metadataRequestTimeout"
@@ -710,7 +716,7 @@
<xsl:variable name="initialHeapSize" select="if (../../u:casPool/@initialFsHeapSize eq 'defaultFsHeapSize')
then '40000' else ../../u:casPool/@initialFsHeapSize"/>
- <constructor-arg index="9" value="{$initialHeapSize}"/>
+ <constructor-arg index="9" value="{$initialHeapSize}"/>
</bean>
</xsl:when>
@@ -750,6 +756,12 @@
<constructor-arg index="8" value="{u:casMultiplier/@initialFsHeapSize}"/>
</xsl:if>
+ <!-- https://issues.apache.org/jira/browse/UIMA-2735 -->
+ <xsl:if test="u:casMultiplier/@disableJCasCache">
+ <xsl:sequence select="f:generateLineComment('CAS Multiplier disableJcasCache', 5)"/>
+ <constructor-arg index="9" value="{u:casMultiplier/@disableJCasCache}" />
+ </xsl:if>
+
<xsl:if test="parent::u:service">
<property name="outputChannel" ref="{f:getOutputChannelID(.)}"/>
</xsl:if>
@@ -1344,6 +1356,7 @@
<constructor-arg index="0" ref="resourceManager"/>
<xsl:sequence select="f:generateLineComment('Defines how many CASes will be in the CAS pool',5)"/>
<property name="casPoolSize" value="{u:casPool/@numberOfCASes}" />
+ <property name="disableJCasCache" value="{u:casPool/@disableJCasCache}" />
<xsl:if test="u:casPool/@initialFsHeapSize">
<xsl:sequence select="f:generateLineComment('Initial heap size for CASes',5)"/>
<property name="initialFsHeapSize" value="{if (u:casPool/@initialFsHeapSize eq 'defaultFsHeapSize')
@@ -1464,10 +1477,10 @@
<xsl:choose>
<xsl:when test= "u:service/u:analysisEngine[(not(@async)) or (@async = ('no', 'false'))]/u:scaleout/@numberOfInstances">
<u:casPool numberOfCASes="{u:service/u:analysisEngine[(not(@async)) or (@async = ('no', 'false'))]/u:scaleout/@numberOfInstances}"
- initialFsHeapSize="defaultFsHeapSize"/>
+ initialFsHeapSize="defaultFsHeapSize" disableJCasCache="false" />
</xsl:when>
<xsl:otherwise>
- <u:casPool numberOfCASes="1" initialFsHeapSize="defaultFsHeapSize"/>
+ <u:casPool numberOfCASes="1" initialFsHeapSize="defaultFsHeapSize" disableJCasCache="false" />
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -1527,7 +1540,9 @@
</xsl:variable>
<u:casPool numberOfCASes="{$casPoolSize}"
- initialFsHeapSize="{if (./@initialFsHeapSize) then ./@initialFsHeapSize else 'defaultFsHeapSize'}"/>
+ initialFsHeapSize="{if (./@initialFsHeapSize) then ./@initialFsHeapSize else 'defaultFsHeapSize'}"
+ disableJCasCache="{if (./@disableJCasCache) then ./@disableJCasCache else 'false'}"
+ />
</xsl:template>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
@@ -1855,6 +1870,7 @@
<xsl:when test="(string($async) eq 'true') and not(parent::u:service)">
<u:casMultiplier
processParentLast="{if (u:casMultiplier/@processParentLast) then u:casMultiplier/@processParentLast else 'false'}"
+ disableJCasCache="{if (u:casMultiplier/@disableJCasCache) then u:casMultiplier/@disableJCasCache else 'false'}"
/>
</xsl:when>
<!-- top level async: no cas multiplier settings are used
@@ -1866,7 +1882,8 @@
a Second Input Q is built for messages from remote cas
Multipliers, at the top level -->
<xsl:when test="string($async) eq 'true'">
- <u:casMultiplier/>
+ <u:casMultiplier
+ disableJCasCache="{if (u:casMultiplier/@disableJCasCache) then u:casMultiplier/@disableJCasCache else 'false'}"/>
</xsl:when>
<!-- case async = false and not top level -->
@@ -1874,12 +1891,14 @@
<u:casMultiplier poolSize="{if (u:casMultiplier/@poolSize) then u:casMultiplier/@poolSize else '1'}"
initialFsHeapSize="{if (u:casMultiplier/@initialFsHeapSize) then u:casMultiplier/@initialFsHeapSize else '2000000'}"
processParentLast="{if (u:casMultiplier/@processParentLast) then u:casMultiplier/@processParentLast else 'false'}"
+ disableJCasCache= "{if (u:casMultiplier/@disableJCasCache) then u:casMultiplier/@disableJCasCache else 'false'}"
/>
</xsl:when>
<!-- case async = false, top level -->
<xsl:otherwise>
<u:casMultiplier poolSize="{if (u:casMultiplier/@poolSize) then u:casMultiplier/@poolSize else '1'}"
initialFsHeapSize="{if (u:casMultiplier/@initialFsHeapSize) then u:casMultiplier/@initialFsHeapSize else '2000000'}"
+ disableJCasCache="{if (u:casMultiplier/@disableJCasCache) then u:casMultiplier/@disableJCasCache else 'false'}"
/>
</xsl:otherwise>
</xsl:choose>
@@ -2288,6 +2307,7 @@
<u:casMultiplier poolSize="{if (u:casMultiplier/@poolSize) then u:casMultiplier/@poolSize else '1'}"
initialFsHeapSize="{if (u:casMultiplier/@initialFsHeapSize) then u:casMultiplier/@initialFsHeapSize else '2000000'}"
processParentLast="{if (u:casMultiplier/@processParentLast) then u:casMultiplier/@processParentLast else 'false'}"
+ disableJCasCache= "{if (u:casMultiplier/@disableJCasCache) then u:casMultiplier/@disableJCasCache else 'false'}"
/>
</xsl:if>
<xsl:variable name="tmp">
@@ -2850,7 +2870,7 @@
<u:version i:maxone=""/>
<u:vendor i:maxone=""/>
<u:deployment i:maxone="" i:required="" protocol="" provider="">
- <u:casPool i:maxone="" numberOfCASes="" initialFsHeapSize=""/>
+ <u:casPool i:maxone="" numberOfCASes="" initialFsHeapSize="" disableJCasCache=""/>
<u:service i:required="">
<u:custom name="" value=""/>
@@ -2866,7 +2886,7 @@
inputQueueScaleout="">
<u:scaleout i:maxone="" numberOfInstances=""/>
<!-- top level cas multiplier can't specify processParentLast -->
- <u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize=""/>
+ <u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize="" disableJCasCache="" />
<u:asyncPrimitiveErrorConfiguration i:maxone="">
<u:processCasErrors i:maxone=""
thresholdCount="" thresholdWindow="" thresholdAction=""/>
@@ -2881,7 +2901,7 @@
<u:delegates i:maxone="">
<u:analysisEngine/>
<u:remoteAnalysisEngine key="" remoteReplyQueueScaleout="">
- <u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize="" processParentLast=""/>
+ <u:casMultiplier i:maxone="" poolSize="" initialFsHeapSize="" processParentLast="" disableJCasCache="" />
<u:inputQueue i:maxone="" i:required="" brokerURL="" endpoint="" queueName=""/>
<u:replyQueue i:maxone="" location=""/>
<u:serializer i:maxone="" method=""/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -197,6 +198,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -449,5 +451,8 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
</beans>
\ No newline at end of file
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueueNoBroker.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueueNoBroker.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueueNoBroker.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueueNoBroker.xml Wed Sep 18 14:06:11 2013
@@ -52,6 +52,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -213,6 +214,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -465,5 +467,8 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
</beans>
\ No newline at end of file
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="3"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -225,6 +226,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_InnerTestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="0"/>
@@ -513,6 +515,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--=====================================-->
<!-- Primitive or non-Async Aggr: NoOpCC -->
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -167,6 +168,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -189,6 +191,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_MeetingDetectorAggregate_1.2"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -367,6 +370,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--===============================================-->
<!-- Async Aggregate: MeetingDetectorAggregate_1.2 -->
@@ -403,7 +409,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.2.1"/>
- <property name="processParentLast" value="false"/>
+ <property name="processParentLast" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="1"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -163,6 +164,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_CollectionReader_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -428,6 +430,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--===============================================-->
<!-- Primitive or non-Async Aggr: TokenAndSentence -->
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/TestThresholdWindow.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/TestThresholdWindow.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/TestThresholdWindow.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/TestThresholdWindow.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="1"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -163,6 +164,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_CollectionReader_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -428,6 +430,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--===============================================-->
<!-- Primitive or non-Async Aggr: TokenAndSentence -->
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml Wed Sep 18 14:06:11 2013
@@ -52,6 +52,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateCM.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateCM.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateCM.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateCM.xml Wed Sep 18 14:06:11 2013
@@ -36,7 +36,8 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
-
+ <property name="disableJCasCache" value="false"/>
+
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
@@ -167,7 +168,8 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
-
+ <property name="disableJCasCache" value="false"/>
+
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
<property name="processRequestTimeout" value="0"/>
@@ -189,6 +191,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_MeetingDetectorAggregate_1.2"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -367,6 +370,10 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
+
</bean>
<!--===============================================-->
<!-- Async Aggregate: MeetingDetectorAggregate_1.2 -->
@@ -403,7 +410,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.2.1"/>
- <property name="processParentLast" value="false"/>
+ <property name="processParentLast" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateErMsgKeys.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateErMsgKeys.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateErMsgKeys.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/aggregateWithInnerAggregateErMsgKeys.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -152,6 +153,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -174,6 +176,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_MeetingDetectorAggregate_1.2"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -352,6 +355,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--===============================================-->
<!-- Async Aggregate: MeetingDetectorAggregate_1.2 -->
@@ -389,6 +395,7 @@
<!-- Delegate key name or remote queue name -->
<property name="endpoint" value="inQ_TestMultiplier_1.2.1"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -519,6 +526,9 @@
<!-- CAS Multiplier initial heap size -->
<constructor-arg index="8" value="2000000"/>
+
+ <!-- CAS Multiplier disableJcasCache -->
+ <constructor-arg index="9" value="false"/>
</bean>
<!--===================================-->
<!-- Primitive or non-Async Aggr: NoOp -->
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAE.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAE.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAE.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAE.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAENoBroker.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAENoBroker.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAENoBroker.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAENoBroker.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggr.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggr.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggr.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggr.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEwithBrokerParms.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEwithBrokerParms.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEwithBrokerParms.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingAEwithBrokerParms.xml Wed Sep 18 14:06:11 2013
@@ -38,6 +38,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="40"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceDiffCasPool.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceDiffCasPool.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceDiffCasPool.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceDiffCasPool.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="40"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="400"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceSameCasPool.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceSameCasPool.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceSameCasPool.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/defaultingPrimAEMultInstanceSameCasPool.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="40"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="400"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml Wed Sep 18 14:06:11 2013
@@ -36,7 +36,8 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="1"/>
-
+ <property name="disableJCasCache" value="false"/>
+
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/iq1AE.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/iq1AE.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/iq1AE.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/iq1AE.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AE.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AE.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AE.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AE.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg2.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg2.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg2.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/iq2AEg2.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/iq3.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/iq3.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/iq3.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/iq3.xml Wed Sep 18 14:06:11 2013
@@ -52,6 +52,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -214,6 +215,7 @@
<property name="shadowCasPoolSize" value="7"/>
<property name="initialFsHeapSize" value="999"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/remoteCasMultiplier.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/remoteCasMultiplier.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/remoteCasMultiplier.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/remoteCasMultiplier.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -198,6 +199,7 @@
<property name="shadowCasPoolSize" value="7"/>
<property name="initialFsHeapSize" value="999"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/remoteSerializer.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/remoteSerializer.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/remoteSerializer.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/remoteSerializer.xml Wed Sep 18 14:06:11 2013
@@ -52,6 +52,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/tempQ1.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/tempQ1.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/tempQ1.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/tempQ1.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="1"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/var1.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/var1.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/var1.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/var1.xml Wed Sep 18 14:06:11 2013
@@ -51,6 +51,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
@@ -213,6 +214,7 @@
<property name="shadowCasPoolSize" value="7"/>
<property name="initialFsHeapSize" value="999"/>
<property name="processParentLast" value="false"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
Modified: uima/uima-as/trunk/src/test/resources/deploy/expected/vmBkrBad.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/test/resources/deploy/expected/vmBkrBad.xml?rev=1524421&r1=1524420&r2=1524421&view=diff
==============================================================================
--- uima/uima-as/trunk/src/test/resources/deploy/expected/vmBkrBad.xml (original)
+++ uima/uima-as/trunk/src/test/resources/deploy/expected/vmBkrBad.xml Wed Sep 18 14:06:11 2013
@@ -36,6 +36,7 @@
<!-- Defines how many CASes will be in the CAS pool -->
<property name="casPoolSize" value="5"/>
+ <property name="disableJCasCache" value="false"/>
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>