You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2011/02/23 16:28:16 UTC

svn commit: r1073781 [1/2] - /uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/

Author: cwiklik
Date: Wed Feb 23 15:28:13 2011
New Revision: 1073781

URL: http://svn.apache.org/viewvc?rev=1073781&view=rev
Log:
UIMA-2069 Remove hard coded broker URLs. Replaced with placeholders

Modified:
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorOnSecondaryBroker.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWith1MillionDocs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateFailure.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithFlowControllerExceptionOnInit.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithInternalCM1000Docs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelayDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithProcessParentLastCMs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithSlowParallelDelegates.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithThresholdWindow.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedCollocatedDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedRemoteDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithRemoteCMAndFailedRemoteDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndFaultyDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplierWithDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateToTestTSMerge.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateUsingRemoteTempQueue.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2Multipliers.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2RemoteMultipliers.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithCollocatedMerger.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithContinueOnRetryFailures.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailedRemoteDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailingCollocatedDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnDisable.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnInitialization.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnNextStep.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpAnnotatorNoRetries.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpDelegateNoRetries.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInnerAggregateCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInternalCM10Docs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithLastCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMergedTypes.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlow.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowDisableOnDelegateFailure.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowTerminateOnDelegateFailure.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlows.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMerger.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteNoOpOnBroker8200.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CMAggregateWithCollocated1MillionDocsCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CMAggregateWithCollocatedCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CMAggregateWithRemote1MillionDocsCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CasMultiplierAggregateWith2InnerMultipliers.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CasMultiplierAggregateWith2Multipliers.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_CasMultiplierAggregateWithRemoteCasMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregateWith1MillionDocs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregateWithFailingInnerAggregateCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregateWithInnerAggregateCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregateWithRemoteAggregateDelegate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_MeetingDetectorAggregate.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_MeetingDetectorTAEWithCM_RemoteRoomNumberDisable.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_MeetingDetectorTAE_RemoteRoomNumber.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_MeetingDetectorTAE_RemoteRoomNumberDisable.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NamesAndPersonTitlesRecognizer.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NewRemoteTestMultiplierWithEH.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotator2.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotator3.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotator4.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorAWithLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorBWithLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorCWithLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorTerminatingOn2Errors.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithCpCDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithCpCException.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithException.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithExceptionOn5thCAS.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithInitException.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_PersonTitleAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RemoteCasMerger.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RemoteCasMultiplier.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RemoteCasMultiplierWith10Docs_1.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RemoteCasMultiplierWith10Docs_2.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RemoteCasMultiplierWith1MillionDocs.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_RoomNumberAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ScaledPersonTitleAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ScaledPrimitiveAggregateAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SimpleAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SingleInstancePersonTitleAnnotator.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SlowNoOpAnnotator1.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SlowNoOpAnnotator2.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SyncAggregateWithJmsService.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SyncAggregateWithJmsServiceAndScaleoutOverride.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SyncAggregateWithJmsServiceLongDelay.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_SyncAggregateWithJmsServiceUsingPlaceholder.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopAggregateWithInnerAggregateCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_WriterAnnotatorA.xml
    uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_WriterAnnotatorB.xml

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotator.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotator.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotator.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotator.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp" remoteReplyQueueScaleout="3">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorOnSecondaryBroker.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorOnSecondaryBroker.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorOnSecondaryBroker.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorOnSecondaryBroker.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8119" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${SecondaryBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="http://localhost:7888"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${BrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWith1MillionDocs.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWith1MillionDocs.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWith1MillionDocs.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWith1MillionDocs.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith1MillionDocs.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp" remoteReplyQueueScaleout="3">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateFailure.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateFailure.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateFailure.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateFailure.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDelegateTimeoutAndContinueOnError.xml Wed Feb 23 15:28:13 2011
@@ -29,14 +29,14 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithDelegateTimeoutAndContinueOnError.xml"/>
       </topDescriptor>
       <analysisEngine>
         <delegates>
           <remoteAnalysisEngine key="NoOpWithLongDelay" remoteReplyQueueScaleout="1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />
@@ -45,7 +45,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp" remoteReplyQueueScaleout="1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithFlowControllerExceptionOnInit.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithFlowControllerExceptionOnInit.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithFlowControllerExceptionOnInit.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithFlowControllerExceptionOnInit.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithFlowControllerExceptionOnInitialize.xml"/>
       </topDescriptor>
@@ -39,7 +39,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegate.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="http://localhost:8888"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultHttpBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="4000" errorAction="disable" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="http://localhost:7888"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${BrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithInternalCM1000Docs.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithInternalCM1000Docs.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithInternalCM1000Docs.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithInternalCM1000Docs.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith1000DocCM.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="binary"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelay.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelay.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelay.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelay.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithLongDelay.xml"/>
       </topDescriptor>
@@ -39,14 +39,14 @@
           </analysisEngine>
         -->
           <remoteAnalysisEngine key="NoOpA">
-	                  <inputQueue endpoint="NoOpAnnotatorAQueue" brokerURL="tcp://localhost:8118"/> 
+	                  <inputQueue endpoint="NoOpAnnotatorAQueue" brokerURL="${DefaultBrokerURL}"/> 
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                       </asyncAggregateErrorConfiguration>
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOpB">
-	                  <inputQueue endpoint="NoOpAnnotatorBQueue" brokerURL="tcp://localhost:8118"/> 
+	                  <inputQueue endpoint="NoOpAnnotatorBQueue" brokerURL="${DefaultBrokerURL}"/> 
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                       </asyncAggregateErrorConfiguration>
@@ -54,7 +54,7 @@
 
 			
           <remoteAnalysisEngine key="NoOpC">
-	                  <inputQueue endpoint="NoOpAnnotatorCQueue" brokerURL="tcp://localhost:8118"/> 
+	                  <inputQueue endpoint="NoOpAnnotatorCQueue" brokerURL="${DefaultBrokerURL}"/> 
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                       </asyncAggregateErrorConfiguration>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelayDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelayDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelayDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithLongDelayDelegate.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithLongDelayDelegate.xml"/>
       </topDescriptor>
@@ -39,7 +39,7 @@
           </analysisEngine>
         
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="tcp://localhost:8118"/> 
+	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="${DefaultBrokerURL}"/> 
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
 						  <getMetadataErrors maxRetries="0" timeout="2000" errorAction="disable"/>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithProcessParentLastCMs.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithProcessParentLastCMs.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithProcessParentLastCMs.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithProcessParentLastCMs.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithParentProcessLast.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithSlowParallelDelegates.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithSlowParallelDelegates.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithSlowParallelDelegates.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithSlowParallelDelegates.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithSlowDelegatesInParallelFlow.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="SlowNoOp1">
-	                  <inputQueue endpoint="SlowNoOpAnnotatorQueue1" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="SlowNoOpAnnotatorQueue1" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="1000" errorAction="terminate" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="SlowNoOp2">
-	                  <inputQueue endpoint="SlowNoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="SlowNoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="1000" errorAction="terminate" />
@@ -59,7 +59,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="1000" errorAction="terminate" />
@@ -68,7 +68,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp2">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="1000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithThresholdWindow.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithThresholdWindow.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithThresholdWindow.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithThresholdWindow.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith100DocCM.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedCollocatedDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedCollocatedDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedCollocatedDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedCollocatedDelegate.xml Wed Feb 23 15:28:13 2011
@@ -30,7 +30,7 @@
     <casPool numberOfCASes="5"/>
     
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateCMWithFailedDelegate.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedRemoteDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedRemoteDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedRemoteDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithFailedRemoteDelegate.xml Wed Feb 23 15:28:13 2011
@@ -30,7 +30,7 @@
     <casPool numberOfCASes="5"/>
     
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateCMWithFailedDelegate.xml"/>
       </topDescriptor>
@@ -42,7 +42,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithRemoteCMAndFailedRemoteDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithRemoteCMAndFailedRemoteDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithRemoteCMAndFailedRemoteDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateCMWithRemoteCMAndFailedRemoteDelegate.xml Wed Feb 23 15:28:13 2011
@@ -30,7 +30,7 @@
     <casPool numberOfCASes="5"/>
     
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateCMWithRemoteCMAndFailedDelegate.xml"/>
       </topDescriptor>
@@ -42,13 +42,13 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="RemoteTestMultiplier">
-	                  <inputQueue endpoint="TestMultiplierQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="TestMultiplierQueue" brokerURL="${DefaultBrokerURL}"/>
                       <casMultiplier poolSize="5"/>
 	                  <serializer method="xmi"/>
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndFaultyDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndFaultyDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndFaultyDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndFaultyDelegate.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithCollocatedCMAndFaultyDelegate.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateErrorHandlingWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/ComplexAggregateTAEWith2InternalCMWithBadDelegate.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplier.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplier.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplier.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplier.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateCasMultiplier.xml"/>
       </topDescriptor>
@@ -37,13 +37,13 @@
         <delegates>
 
           <remoteAnalysisEngine key="TestMultiplier">
-	                  <inputQueue endpoint="TestMultiplierQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="TestMultiplierQueue" brokerURL="${DefaultBrokerURL}"/>
                       <casMultiplier poolSize="5"/>
 	                  <serializer method="xmi"/>
           </remoteAnalysisEngine>
           
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="4000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplierWithDelay.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplierWithDelay.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplierWithDelay.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateMultiplierWithDelay.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="1"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateToTestTSMerge.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateToTestTSMerge.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateToTestTSMerge.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateToTestTSMerge.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/TypeSystemMergeTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="GovOffReco" remoteReplyQueueScaleout="1">
-	                  <inputQueue endpoint="GovOfficialRecognizerQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="GovOfficialRecognizerQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="PersonTitleReco" remoteReplyQueueScaleout="1">
-	                  <inputQueue endpoint="NamesAndPersonTitlesQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NamesAndPersonTitlesQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />
@@ -59,7 +59,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="TokenSentenceReco" remoteReplyQueueScaleout="1">
-	                  <inputQueue endpoint="TokenSentenceRecognizerQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="TokenSentenceRecognizerQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateUsingRemoteTempQueue.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateUsingRemoteTempQueue.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateUsingRemoteTempQueue.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateUsingRemoteTempQueue.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
         
         
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="disable" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2Multipliers.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2Multipliers.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2Multipliers.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2Multipliers.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5" initialFsHeapSize="2000000"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith2Multipliers.xml"/>
       </topDescriptor>
@@ -44,7 +44,7 @@
             </asyncAggregateErrorConfiguration>
           </analysisEngine>
           <remoteAnalysisEngine key="NoOp">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="NoOpAnnotatorQueue"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="NoOpAnnotatorQueue"/>
             <serializer method="xmi"/>
             <asyncAggregateErrorConfiguration>
               <getMetadataErrors maxRetries="0" timeout="60000" errorAction="disable"/>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2RemoteMultipliers.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2RemoteMultipliers.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2RemoteMultipliers.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWith2RemoteMultipliers.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5" initialFsHeapSize="2000000"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith2RemoteMultipliers.xml"/>
       </topDescriptor>
@@ -36,7 +36,7 @@
         <delegates>
           
 		  <remoteAnalysisEngine key="TestMultiplier">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="TestMultiplierQueue"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="TestMultiplierQueue"/>
 
             <casMultiplier poolSize="5" initialFsHeapSize="2000000"/>
             <asyncAggregateErrorConfiguration>
@@ -47,7 +47,7 @@
           </remoteAnalysisEngine>
           
 		  <remoteAnalysisEngine key="SimpleCasGenerator">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="TestMultiplierQueue2"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="TestMultiplierQueue2"/>
             <casMultiplier poolSize="3" initialFsHeapSize="2000000"/>
             <asyncAggregateErrorConfiguration>
               <getMetadataErrors maxRetries="0" timeout="0" errorAction="terminate"/>
@@ -57,7 +57,7 @@
           </remoteAnalysisEngine>
 
 		  <remoteAnalysisEngine key="NoOp">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="NoOpAnnotatorQueue"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="NoOpAnnotatorQueue"/>
             <serializer method="xmi"/>
             <asyncAggregateErrorConfiguration>
               <getMetadataErrors maxRetries="0" timeout="0" errorAction="disable"/>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithCollocatedMerger.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithCollocatedMerger.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithCollocatedMerger.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithCollocatedMerger.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithCasMerger.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithContinueOnRetryFailures.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithContinueOnRetryFailures.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithContinueOnRetryFailures.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithContinueOnRetryFailures.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="1"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithRetries.xml"/>
       </topDescriptor>
@@ -43,7 +43,7 @@
             </asyncAggregateErrorConfiguration>
           </analysisEngine>
           <remoteAnalysisEngine key="WriterAnnotatorA">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="WriterAnnotatorA"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="WriterAnnotatorA"/>
             <serializer method="xmi"/>
             <asyncAggregateErrorConfiguration>
               <getMetadataErrors maxRetries="0" timeout="0" errorAction="terminate"/>
@@ -61,7 +61,7 @@
             </asyncAggregateErrorConfiguration>
           </analysisEngine>
           <remoteAnalysisEngine key="WriterAnnotatorB">
-            <inputQueue brokerURL="tcp://localhost:8118" endpoint="WriterAnnotatorB"/>
+            <inputQueue brokerURL="${DefaultBrokerURL}" endpoint="WriterAnnotatorB"/>
             <serializer method="xmi"/>
             <asyncAggregateErrorConfiguration>
               <getMetadataErrors maxRetries="0" timeout="0" errorAction="terminate"/>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailedRemoteDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailedRemoteDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailedRemoteDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailedRemoteDelegate.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithFailedDelegate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailingCollocatedDelegate.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailingCollocatedDelegate.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailingCollocatedDelegate.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFailingCollocatedDelegate.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithFailingCollocatedComponent.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnDisable.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnDisable.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnDisable.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnDisable.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithFlowControllerExceptionOnDisableDelegate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="5000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnInitialization.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnInitialization.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnInitialization.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnInitialization.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithFlowControllerExceptionOnInitialization.xml"/>
       </topDescriptor>
@@ -39,7 +39,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="5000" errorAction="disable" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnNextStep.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnNextStep.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnNextStep.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithFlowControllerExceptionOnNextStep.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/ComplexNestedAggregate_TAE.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="MeetingDetector">
-            <inputQueue endpoint="MeetingDetectorTaeQueue" brokerURL="tcp://localhost:8118"/>
+            <inputQueue endpoint="MeetingDetectorTaeQueue" brokerURL="${DefaultBrokerURL}"/>
             <serializer method="xmi"/>
           </remoteAnalysisEngine>
         </delegates>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpAnnotatorNoRetries.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpAnnotatorNoRetries.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpAnnotatorNoRetries.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpAnnotatorNoRetries.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="http://localhost:8888"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultHttpBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpDelegateNoRetries.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpDelegateNoRetries.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpDelegateNoRetries.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithHttpDelegateNoRetries.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="http://localhost:8888"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultHttpBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInnerAggregateCM.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInnerAggregateCM.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInnerAggregateCM.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInnerAggregateCM.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="SecondLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="SecondLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/AggregateCMWithInnerAggregateCM.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInternalCM10Docs.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInternalCM10Docs.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInternalCM10Docs.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithInternalCM10Docs.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="SecondLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="SecondLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWith1000DocCM.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithLastCM.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithLastCM.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithLastCM.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithLastCM.xml Wed Feb 23 15:28:13 2011
@@ -27,7 +27,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="3" initialFsHeapSize="2000000"/> 
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="0"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="0"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithLastCasMultiplier.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMergedTypes.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMergedTypes.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMergedTypes.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMergedTypes.xml Wed Feb 23 15:28:13 2011
@@ -28,7 +28,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5" initialFsHeapSize="2000000"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithMergedTypes.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithMultiplierAndNestedAggregateDelegateWithMultiplier.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/ComplexAggregateTAEWith2InternalCM.xml"/>
       </topDescriptor>

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlow.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlow.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlow.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlow.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithParallelFlow.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="disable" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp2">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowDisableOnDelegateFailure.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowDisableOnDelegateFailure.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowDisableOnDelegateFailure.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowDisableOnDelegateFailure.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithParallelFlowCheck.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp2">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowTerminateOnDelegateFailure.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowTerminateOnDelegateFailure.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowTerminateOnDelegateFailure.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlowTerminateOnDelegateFailure.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithParallelFlow.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp2">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlows.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlows.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlows.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithParallelFlows.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithParallelFlows.xml"/>
       </topDescriptor>
@@ -41,7 +41,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="NoOp1">
-	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueueLongDelay" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="disable" />
@@ -50,7 +50,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp2">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue2" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />
@@ -59,7 +59,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp3">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />
@@ -68,7 +68,7 @@
           </remoteAnalysisEngine>
 
           <remoteAnalysisEngine key="NoOp4">
-	                  <inputQueue endpoint="NoOpAnnotatorQueue3" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="NoOpAnnotatorQueue3" brokerURL="${DefaultBrokerURL}"/>
 	                  <serializer method="xmi"/>
                       <asyncAggregateErrorConfiguration>
                             <getMetadataErrors maxRetries="0" timeout="4000" errorAction="terminate" />

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMerger.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMerger.xml?rev=1073781&r1=1073780&r2=1073781&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMerger.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateWithRemoteMerger.xml Wed Feb 23 15:28:13 2011
@@ -29,7 +29,7 @@
   <deployment protocol="jms" provider="activemq">
     <casPool numberOfCASes="5"/>
     <service>
-      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
+      <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
       <topDescriptor>
         <import location="../descriptors/analysis_engine/SimpleTestAggregateWithCasMerger.xml"/>
       </topDescriptor>
@@ -47,7 +47,7 @@
           </analysisEngine>
 
           <remoteAnalysisEngine key="TestMerger">
-	                  <inputQueue endpoint="TestMergerQueue" brokerURL="tcp://localhost:8118"/>
+	                  <inputQueue endpoint="TestMergerQueue" brokerURL="${DefaultBrokerURL}"/>
                       <casMultiplier poolSize="5"/>
 	                  <serializer method="xmi"/>
           </remoteAnalysisEngine>