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 2009/04/02 22:11:43 UTC
svn commit: r761408 [1/2] - 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/
Author: schor
Date: Thu Apr 2 20:11:42 2009
New Revision: 761408
URL: http://svn.apache.org/viewvc?rev=761408&view=rev
Log:
[UIMA-1288] made use of vm://localhost specified by a user explicitly generate an ERROR. Added provision to support the syntax ${xxxxx} for names of brokers, and added the Spring bean needed to resolve this. Removed the beans not needed for vm://localhost. Jerry Cwiklik tested - seems OK. Redid the test cases to account for these changes.
Added:
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/var1.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/expected/Deploy_AggregateUsingRemoteTempQueue.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.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/aggrRmtConcurrentReply.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.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/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/expected/remoteCasMultiplier.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.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/expected/vmBkrBad.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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -98,7 +98,7 @@
<!-- collect unique instances of queue brokers where we need generate
a broker factory.
- Omit vm://localBroker ones - those use a common factory for this node
+ obsolete ->> Jira UIMA-1288 Omit vm://localBroker ones - those use a common factory for this node
Include remotes if the replyQueue is "remote"
-->
@@ -120,7 +120,7 @@
-->
<xsl:for-each-group group-by="@brokerURL"
select="$ddd//u:inputQueue
- [ @brokerURL ne 'vm://localhost' ]">
+ [ @brokerURL ne 'vm://localhost' ]">
<!--xsl:message select="('*** ', ..)"/-->
<xsl:sequence select="."/>
</xsl:for-each-group>
@@ -1264,13 +1264,14 @@
<xsl:template name="generateStandardBeans">
- <!-- need an internal broker if any of the following are true -->
+ <!-- no longer true need an internal broker if any of the following are true -->
<!-- A service is async = true (implies aggregate)
or The service specifies its input queue as "vm:..."
-->
<!-- only generate for inputq = localhost. async=true handled with Java queue -->
<!-- removed: boolean(u:service/u:analysisEngine[@async eq 'true']) or -->
+ <!-- next removed per Jira UIMA-1288
<xsl:if
test="boolean(u:service/u:inputQueue[@brokerURL='vm://localhost'])">
@@ -1282,8 +1283,10 @@
<property name="prefetchPolicy" ref="prefetchPolicy"/>
</bean>
</xsl:if>
+ -->
<!-- no longer for async=true, only for inputq = localhost -->
+ <!-- next removed per Jira UIMA-1288
<xsl:if test="boolean(u:service/u:inputQueue[@brokerURL='vm://localhost'])">
<xsl:sequence select="f:generateLineComment('Deploys a co-located broker',3)"/>
<bean id="brokerDeployerService" class="org.apache.uima.adapter.jms.activemq.BrokerDeployer">
@@ -1291,6 +1294,7 @@
</bean>
</xsl:if>
+ -->
<!--
<xsl:message select="$uniqueInputQueueBrokers"/>
<xsl:message select="name($uniqueInputQueueBrokers/u:inputQueue)"/>
@@ -1342,6 +1346,11 @@
</xsl:if>
</bean>
+ <!-- create bean to do placeholder substitution Jira UIMA-1288 -->
+ <bean id="placeholderSubstitution" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
+
<!-- Creates a Shared Cache -->
<xsl:sequence select="f:generateLineComment('Creates a Shared Cache',3)"/>
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache" />
@@ -1503,7 +1512,8 @@
<xsl:choose>
<xsl:when test="u:inputQueue">
- <xsl:if test="not(starts-with(u:inputQueue/@brokerURL, 'tcp://'))">
+ <xsl:if test="not(starts-with(u:inputQueue/@brokerURL, 'tcp://')) and
+ not(starts-with(u:inputQueue/@brokerURL, '${'))">
<xsl:sequence select="f:msgWithLineNumber(
'ERROR',
'top level input Queue broker protocol must be tcp:// for a top level C++ component',
@@ -1585,6 +1595,12 @@
<!--xsl:message select="'ERROR: missing endpoint name in inputQueue element'"/-->
<xsl:message select="."/>
</xsl:if>
+ <xsl:if test="@brokerURL eq 'vm://localhost'">
+ <xsl:sequence select="f:msgWithLineNumber(
+ 'ERROR',
+ 'broker protocol of vm://localhost not supported',
+ .)"/>
+ </xsl:if>
<xsl:choose>
<xsl:when test="../../u:remoteAnalysisEngine">
<xsl:choose>
@@ -2486,13 +2502,23 @@
<xsl:function name="f:getQbrokerID">
<xsl:param name="inputQueue"/>
- <xsl:variable name="u" select=
- "replace(
- replace(
- replace($inputQueue/@brokerURL,':','_c_')
- ,'//','_ss_')
- ,'/', '_s_')"/>
-
+ <xsl:variable name="u">
+ <xsl:choose>
+ <xsl:when test="starts-with($inputQueue/@brokerURL, '${')">
+ <xsl:sequence select=
+ "replace(replace($inputQueue/@brokerURL, '\$\{', ''), '\}', '')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:sequence select=
+ "replace(
+ replace(
+ replace($inputQueue/@brokerURL,':','_c_')
+ ,'//','_ss_')
+ ,'/', '_s_')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:sequence select="concat('qBroker_',$u)"/>
</xsl:function>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -90,6 +90,10 @@
}
+ public void testDd2Spring_var1() throws Exception {
+ checkDd2Spring("var1.xml");
+ }
+
public void testDd2Spring_CMAggregateWithCollocatedCM() throws Exception {
checkDd2Spring("Deploy_CMAggregateWithCollocatedCM.xml");
}
@@ -177,7 +181,8 @@
public void testDd2Spring_CPPwrongProtocol() throws Exception {
checkDd2SpringErrMsg(
"envVar/envVarCPPwrongProtocol.xml",
- "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");
+ "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" +
+ "\n *** ERROR: line-number: 31 broker protocol of vm://localhost not supported");
}
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_AggregateUsingRemoteTempQueue.xml -->
- <!-- 26 March, 2009, 4:18:34 P.M. -->
+ <!-- 2 April, 2009, 11:37:31 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -216,7 +220,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_9.2.35.42-4dec76eb:120446f1dde:-8000"/>
+ value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_9.2.35.42-74792c12:120677a5611:-8000"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="4000"/>
@@ -281,7 +285,7 @@
<bean id="rmtRtrnQ_TopLevelTaeQueue_1_NoOp"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_9.2.35.42-4dec76eb:120446f1dde:-8000"/>
+ value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_9.2.35.42-74792c12:120677a5611:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_CMAggregateWithCollocatedCM.xml -->
- <!-- 26 March, 2009, 4:03:55 P.M. -->
+ <!-- 2 April, 2009, 11:37:33 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -244,7 +248,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_9.2.35.42-2fa7c25b:1204461b724:-8000"/>
+ value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_9.2.35.42-13e17b06:120677a5eeb:-8000"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="0"/>
@@ -330,7 +334,7 @@
<bean id="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_9.2.35.42-2fa7c25b:1204461b724:-8000"/>
+ value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_9.2.35.42-13e17b06:120677a5eeb:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_ComplexAggregateWithInnerAggregateCM.xml -->
- <!-- 26 March, 2009, 4:03:56 P.M. -->
+ <!-- 2 April, 2009, 11:37:36 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_MeetingFinder.xml -->
- <!-- 26 March, 2009, 4:19:06 P.M. -->
+ <!-- 2 April, 2009, 11:37:38 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml Thu Apr 2 20:11:42 2009
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--==================================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml -->
- <!-- 9 January, 2009, 1:45:24 P.M. -->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml -->
+ <!-- 2 April, 2009, 11:37:11 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -56,6 +56,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -118,7 +122,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -215,7 +219,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.129-628e130c:11ebcb68398:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.4259f0db9f:120677a067a:-8000"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -304,7 +308,7 @@
<bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.129-628e130c:11ebcb68398:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.4259f0db9f:120677a067a:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -468,7 +472,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumber"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -489,7 +493,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/coLocatedCasMultiplier.xml -->
- <!-- 26 March, 2009, 4:03:49 P.M. -->
+ <!-- 2 April, 2009, 11:37:13 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--==========================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAE.xml -->
- <!-- 9 January, 2009, 1:45:37 P.M. -->
- <!--==========================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAE.xml -->
+ <!-- 2 April, 2009, 11:37:20 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--==============================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggr.xml -->
- <!-- 9 January, 2009, 1:45:40 P.M. -->
- <!--==============================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggr.xml -->
+ <!-- 2 April, 2009, 11:37:24 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--==================================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml -->
- <!-- 9 January, 2009, 1:45:44 P.M. -->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml -->
+ <!-- 2 April, 2009, 11:37:27 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -102,7 +106,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -367,7 +371,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumber"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -388,7 +392,7 @@
<!-- Key name -->
<constructor-arg index="1" value="DateTime"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -409,7 +413,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--==================================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAEMultInstance.xml -->
- <!-- 9 January, 2009, 1:45:47 P.M. -->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAEMultInstance.xml -->
+ <!-- 2 April, 2009, 11:37:29 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--==============================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP.xml -->
- <!-- 9 January, 2009, 1:45:11 P.M. -->
- <!--==============================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP.xml -->
+ <!-- 2 April, 2009, 11:37:01 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -15,7 +15,7 @@
<!-- path to top level descriptor -->
<constructor-arg index="0"
- value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
<!-- input q name -->
<constructor-arg index="1" value="MeetingDetectorTaeQueue"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--===============================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP1.xml -->
- <!-- 9 January, 2009, 1:45:14 P.M. -->
- <!--===============================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP1.xml -->
+ <!-- 2 April, 2009, 11:37:05 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -18,7 +18,7 @@
<!-- path to top level descriptor -->
<constructor-arg index="0"
- value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
<!-- input q name -->
<constructor-arg index="1" value="MeetingDetectorTaeQueue"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--==================================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPPwrongProtocol.xml -->
- <!-- 9 January, 2009, 1:45:17 P.M. -->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPPwrongProtocol.xml -->
+ <!-- 2 April, 2009, 11:43:02 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -15,7 +15,7 @@
<!-- path to top level descriptor -->
<constructor-arg index="0"
- value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/>
<!-- input q name -->
<constructor-arg index="1" value="MeetingDetectorTaeQueue"/>
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=761408&r1=761407&r2=761408&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 Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--=================================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarNotCPP.xml -->
- <!-- 9 January, 2009, 1:45:21 P.M. -->
- <!--=================================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarNotCPP.xml -->
+ <!-- 2 April, 2009, 11:37:09 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="MeetingDetectorTaeQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: 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=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--===================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq1AE.xml -->
- <!-- 9 January, 2009, 1:45:57 P.M. -->
- <!--===================================================================-->
+<!--=============================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq1AE.xml -->
+ <!-- 2 April, 2009, 11:37:40 A.M. -->
+ <!--=============================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--===================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AE.xml -->
- <!-- 9 January, 2009, 1:46:00 P.M. -->
- <!--===================================================================-->
+<!--=============================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AE.xml -->
+ <!-- 2 April, 2009, 11:37:42 A.M. -->
+ <!--=============================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -87,7 +91,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--====================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AEg.xml -->
- <!-- 9 January, 2009, 1:46:03 P.M. -->
- <!--====================================================================-->
+<!--==============================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AEg.xml -->
+ <!-- 2 April, 2009, 11:37:43 A.M. -->
+ <!--==============================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -102,7 +106,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -367,7 +371,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumber"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -388,7 +392,7 @@
<!-- Key name -->
<constructor-arg index="1" value="DateTime"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -409,7 +413,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--=====================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AEg2.xml -->
- <!-- 9 January, 2009, 1:46:07 P.M. -->
- <!--=====================================================================-->
+<!--===============================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AEg2.xml -->
+ <!-- 2 April, 2009, 11:37:47 A.M. -->
+ <!--===============================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -102,7 +106,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -367,7 +371,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumber"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -388,7 +392,7 @@
<!-- Key name -->
<constructor-arg index="1" value="DateTime"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -409,7 +413,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--===========================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq3.xml -->
- <!-- 26 March, 2009, 4:04:02 P.M. -->
+ <!-- 2 April, 2009, 11:37:49 A.M. -->
<!--===========================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -56,6 +56,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -206,7 +210,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.421beb7ed1:1204461cf8e:-8000"/>
+ value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.424ba097ee:120677a9b96:-8000"/>
<property name="shadowCasPoolSize" value="7"/>
<property name="initialFsHeapSize" value="999"/>
<property name="processParentLast" value="false"/>
@@ -298,7 +302,7 @@
<bean id="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.421beb7ed1:1204461cf8e:-8000"/>
+ value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.424ba097ee:120677a9b96:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml Thu Apr 2 20:11:42 2009
@@ -2,7 +2,7 @@
<!--==================================================================================-->
<!-- Generated from -->
<!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/remoteCasMultiplier.xml -->
- <!-- 26 March, 2009, 4:04:02 P.M. -->
+ <!-- 2 April, 2009, 11:37:51 A.M. -->
<!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -190,7 +194,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.427ff8661c:1204461d2f9:-8000"/>
+ value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.426053bc13:120677aa4fd:-8000"/>
<property name="shadowCasPoolSize" value="7"/>
<property name="initialFsHeapSize" value="999"/>
<property name="processParentLast" value="false"/>
@@ -282,7 +286,7 @@
<bean id="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.427ff8661c:1204461d2f9:-8000"/>
+ value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_9.2.35.426053bc13:120677aa4fd:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--==============================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/remoteSerializer.xml -->
- <!-- 9 January, 2009, 1:46:17 P.M. -->
- <!--==============================================================================-->
+<!--==================================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/remoteSerializer.xml -->
+ <!-- 2 April, 2009, 11:37:54 A.M. -->
+ <!--==================================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -56,6 +56,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -118,7 +122,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -215,7 +219,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.1291c3252cf:11ebcb7531e:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.42-719c910d:120677aae72:-8000"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -304,7 +308,7 @@
<bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.1291c3252cf:11ebcb7531e:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_9.2.35.42-719c910d:120677aae72:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -468,7 +472,7 @@
<!-- Key name -->
<constructor-arg index="1" value="RoomNumber"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -489,7 +493,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml?rev=761408&r1=761407&r2=761408&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml Thu Apr 2 20:11:42 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--====================================================================-->
- <!-- Generated from -->
- <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/tempQ1.xml -->
- <!-- 9 January, 2009, 1:46:20 P.M. -->
- <!--====================================================================-->
+<!--==============================================================================-->
+ <!-- Generated from -->
+ <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/tempQ1.xml -->
+ <!-- 2 April, 2009, 11:37:56 A.M. -->
+ <!--==============================================================================-->
<!DOCTYPE beans
PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -40,6 +40,10 @@
<!-- Initial heap size for CASes -->
<property name="initialFsHeapSize" value="2000000"/>
</bean>
+ <bean id="placeholderSubstitution"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ </bean>
<!-- Creates a Shared Cache -->
<bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/>
@@ -102,7 +106,7 @@
</constructor-arg>
<constructor-arg index="1" value="RoomNumberAnnotatorQueue"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
<constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/>
@@ -179,7 +183,7 @@
<!-- Queue name used for replies, on the remote broker -->
<property name="replyToEndpoint"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_9.2.35.129-6cf4c2e2:11ebcb7602d:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_9.2.35.425aba5165:120677ab77b:-8000"/>
<!-- Timeouts -->
<property name="metadataRequestTimeout" value="60000"/>
@@ -288,7 +292,7 @@
<bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber"
class="org.apache.activemq.command.ActiveMQQueue">
<constructor-arg index="0"
- value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_9.2.35.129-6cf4c2e2:11ebcb7602d:-8000"/>
+ value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_9.2.35.425aba5165:120677ab77b:-8000"/>
</bean>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -452,7 +456,7 @@
<!-- Key name -->
<constructor-arg index="1" value="DateTime"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>
@@ -473,7 +477,7 @@
<!-- Key name -->
<constructor-arg index="1" value="Meeting"/>
<constructor-arg index="2"
- value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
+ value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/>
<constructor-arg index="3" ref="casManager"/>
<constructor-arg index="4" ref="inProcessCache"/>