You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/06/18 20:07:26 UTC
svn commit: r669239 - in
/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src:
main/java/org/apache/uima/adapter/jms/client/ test/resources/deployment/
test/resources/descriptors/analysis_engine/
Author: eae
Date: Wed Jun 18 11:07:26 2008
New Revision: 669239
URL: http://svn.apache.org/viewvc?rev=669239&view=rev
Log:
UIMA-1019 commit of Jerry's patch-3 files.
Modified:
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=669239&r1=669238&r2=669239&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Wed Jun 18 11:07:26 2008
@@ -721,7 +721,9 @@
msg.setIntProperty(AsynchAEMessage.Payload, AsynchAEMessage.None);
msg.setStringProperty(AsynchAEMessage.CasReference, aCasReferenceId);
msg.setIntProperty(AsynchAEMessage.MessageType, AsynchAEMessage.Request);
- msg.setIntProperty(AsynchAEMessage.Command, AsynchAEMessage.ReleaseCAS);
+ msg.setIntProperty(AsynchAEMessage.Command, AsynchAEMessage.ReleaseCAS);
+ msg.setStringProperty(UIMAMessage.ServerURI, brokerURI);
+ msg.setJMSReplyTo(consumerDestination);
}
public void notifyOnInitializationFailure(Exception e) {
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml?rev=669239&r1=669238&r2=669239&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/deployment/Deploy_TopLevelBlueJAggregateCM.xml Wed Jun 18 11:07:26 2008
@@ -68,7 +68,8 @@
</asyncAggregateErrorConfiguration>
</remoteAnalysisEngine>
- <analysisEngine key="BlueJNoOpCandidateAnswer" async="false">
+ <analysisEngine key="BlueJNoOpCandidateAnswerCM" async="false">
+ <casMultiplier poolSize="3" initialFsHeapSize="2000000"/>
<asyncAggregateErrorConfiguration>
<getMetadataErrors maxRetries="0" timeout="0" errorAction="disable"/>
<processCasErrors maxRetries="0" timeout="0" continueOnRetryFailure="false" thresholdCount="1" thresholdWindow="0" thresholdAction="terminate"/>
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml?rev=669239&r1=669238&r2=669239&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/CasMultiplierAggregateWith2Multipliers.xml Wed Jun 18 11:07:26 2008
@@ -38,8 +38,9 @@
</delegateAnalysisEngine>
- <delegateAnalysisEngine key="BlueJNoOpCandidateAnswer">
- <import location="BlueJNoOpCandidateAnswer.xml"/>
+ <delegateAnalysisEngine key="BlueJNoOpCandidateAnswerCM">
+ <!-- <import location="BlueJNoOpCandidateAnswer.xml"/> -->
+ <import location="../multiplier/SimpleCasGenerator.xml"/>
</delegateAnalysisEngine>
<delegateAnalysisEngine key="BlueJNoOpCC">
@@ -77,7 +78,7 @@
<node>BlueJTestMultiplier1</node>
<node>BlueJTestMultiplier2</node>
<node>BlueJInnerRemoteCMAggregate</node>
- <node>BlueJNoOpCandidateAnswer</node>
+ <node>BlueJNoOpCandidateAnswerCM</node>
<node>BlueJNoOpCC</node>
</fixedFlow>
</flowConstraints>