Author: cwiklik
Date: Wed Jul 10 20:47:41 2013
New Revision: 1501985
URL: http://svn.apache.org/r1501985
Log:
UIMA-2926 removed references to bluej
Added:
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelComplexAggregateCM.xml
- copied unchanged from r1488254,
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpCC.xml
- copied unchanged from r1488254,
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/BlueJNoOpCC.xml
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpCandidateAnswer.xml
- copied unchanged from r1488254,
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/BlueJNoOpCandidateAnswer.xml
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=1501985&r1=1501984&r2=1501985&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
Wed Jul 10 20:47:41 2013
@@ -2702,8 +2702,8 @@ public class TestUimaASExtended extends
}
}
- public void testBlueJDeployment() throws Exception {
- System.out.println("-------------- testBlueJDeployment -------------");
+ public void testComplexDeployment() throws Exception {
+ System.out.println("-------------- testComplexDeployment -------------");
BaseUIMAAsynchronousEngine_impl eeUimaEngine = new
BaseUIMAAsynchronousEngine_impl();
// Deploy replicated services for the inner remote aggregate CM
deployService(eeUimaEngine, relativePath + "/Deploy_NoOpAnnotator.xml");
@@ -2715,7 +2715,7 @@ public class TestUimaASExtended extends
deployService(eeUimaEngine, relativePath +
"/Deploy_CMAggregateWithCollocatedCM.xml");
// Deploy top level Aggregate Cas Multiplier with 2 collocated Cas
Multipliers
// CM1 --> CM2 --> Remote AggregateCM --> Candidate Answer --> CC
- deployService(eeUimaEngine, relativePath +
"/Deploy_TopLevelBlueJAggregateCM.xml");
+ deployService(eeUimaEngine, relativePath +
"/Deploy_TopLevelComplexAggregateCM.xml");
runTest2(null, eeUimaEngine,
String.valueOf(broker.getMasterConnectorURI()),
"TopLevelTaeQueue", 10, PROCESS_LATCH);
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml?rev=1501985&r1=1501984&r2=1501985&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_ComplexAggregate.xml
Wed Jul 10 20:47:41 2013
@@ -34,13 +34,16 @@
<import
location="../descriptors/analysis_engine/ComplexAggregate_TAE.xml"/>
</topDescriptor>
<analysisEngine>
- <delegates>
+ <scaleout numberOfInstances="5"/>
+
+ <!--delegates>
<analysisEngine key="TestMultiplier">
<casMultiplier poolSize="5"/>
</analysisEngine>
<analysisEngine key="MeetingDetector">
+
<delegates>
<remoteAnalysisEngine key="NoOp">
<inputQueue endpoint="NoOpAnnotatorQueue"
brokerURL="${DefaultBrokerURL}"/>
@@ -52,7 +55,7 @@
</remoteAnalysisEngine>
</delegates>
</analysisEngine>
- </delegates>
+ </delegates-->
</analysisEngine>
</service>
</deployment>
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml?rev=1501985&r1=1501984&r2=1501985&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
Wed Jul 10 20:47:41 2013
@@ -24,27 +24,27 @@
<primitive>false</primitive>
<delegateAnalysisEngineSpecifiers>
- <delegateAnalysisEngine key="BlueJTestMultiplier1">
+ <delegateAnalysisEngine key="TestMultiplier1">
<import location="../multiplier/SimpleCasGenerator.xml"/>
</delegateAnalysisEngine>
- <delegateAnalysisEngine key="BlueJTestMultiplier2">
+ <delegateAnalysisEngine key="TestMultiplier2">
<import location="../multiplier/SimpleCasGenerator.xml"/>
</delegateAnalysisEngine>
- <delegateAnalysisEngine key="BlueJInnerRemoteCMAggregate">
+ <delegateAnalysisEngine key="InnerRemoteCMAggregate">
<import location="SimpleTestCMAggregateWithCollocatedCM.xml"/>
</delegateAnalysisEngine>
- <delegateAnalysisEngine key="BlueJNoOpCandidateAnswerCM">
- <!-- <import location="BlueJNoOpCandidateAnswer.xml"/> -->
+ <delegateAnalysisEngine key="NoOpCandidateAnswerCM">
+ <!-- <import location="NoOpCandidateAnswer.xml"/> -->
<import location="../multiplier/SimpleCasGenerator.xml"/>
</delegateAnalysisEngine>
- <delegateAnalysisEngine key="BlueJNoOpCC">
- <import location="BlueJNoOpCC.xml"/>
+ <delegateAnalysisEngine key="NoOpCC">
+ <import location="NoOpCC.xml"/>
</delegateAnalysisEngine>
</delegateAnalysisEngineSpecifiers>
@@ -59,8 +59,8 @@
<multiValued>false</multiValued>
<mandatory>true</mandatory>
<overrides>
- <parameter>BlueJTestMultiplier1/NumberToGenerate</parameter>
- <parameter>BlueJTestMultiplier2/NumberToGenerate</parameter>
+ <parameter>TestMultiplier1/NumberToGenerate</parameter>
+ <parameter>TestMultiplier2/NumberToGenerate</parameter>
</overrides>
</configurationParameter>
</configurationParameters>
@@ -75,11 +75,11 @@
<flowConstraints>
<fixedFlow>
- <node>BlueJTestMultiplier1</node>
- <node>BlueJTestMultiplier2</node>
- <node>BlueJInnerRemoteCMAggregate</node>
- <node>BlueJNoOpCandidateAnswerCM</node>
- <node>BlueJNoOpCC</node>
+ <node>TestMultiplier1</node>
+ <node>TestMultiplier2</node>
+ <node>InnerRemoteCMAggregate</node>
+ <node>NoOpCandidateAnswerCM</node>
+ <node>NoOpCC</node>
</fixedFlow>
</flowConstraints>
<capabilities>
