You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/07/08 15:30:13 UTC
svn commit: r961760 - in /uima/uima-as/branches/depend-on-parent-pom-4:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/
uima-as-docbooks/ uimaj-as-activemq/
uimaj-as-activemq/src/test/resources/deployment/ uimaj-as-activemq/src/tes...
Author: schor
Date: Thu Jul 8 13:30:13 2010
New Revision: 961760
URL: http://svn.apache.org/viewvc?rev=961760&view=rev
Log:
[UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests)
Added:
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml
- copied unchanged from r961754, uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml
- copied unchanged from r961754, uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml
Modified:
uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uima-as-distr/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uima-as-docbooks/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-camel/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-core/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-jms/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-osgi-runtime/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-deployeditor/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-deployeditor/ (props changed)
uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-runtime-deployeditor/ (props changed)
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/aggregate-uima-as:944306-944449
+/uima/uima-as/trunk/aggregate-uima-as:961335-961754
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins:944306-944449
+/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uima-as-distr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uima-as-distr:941450-944449
+/uima/uima-as/trunk/uima-as-distr:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uima-as-docbooks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uima-as-docbooks:941450-944455
+/uima/uima-as/trunk/uima-as-docbooks:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-as-activemq:941450-944450
+/uima/uima-as/trunk/uimaj-as-activemq:961335-961754
Modified: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml?rev=961760&r1=961759&r2=961760&view=diff
==============================================================================
--- uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml (original)
+++ uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml Thu Jul 8 13:30:13 2010
@@ -32,7 +32,7 @@
<service>
<inputQueue endpoint="EmailRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml"/>
+ <import location="../descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
Modified: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml?rev=961760&r1=961759&r2=961760&view=diff
==============================================================================
--- uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml (original)
+++ uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml Thu Jul 8 13:30:13 2010
@@ -32,7 +32,7 @@
<service>
<inputQueue endpoint="GovOfficialRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml"/>
+ <import location="../descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
Modified: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml?rev=961760&r1=961759&r2=961760&view=diff
==============================================================================
--- uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml (original)
+++ uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml Thu Jul 8 13:30:13 2010
@@ -32,11 +32,10 @@
<service>
<inputQueue endpoint="TokenSentenceRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/>
+ <import location="../descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
- <!-- <processCasErrors thresholdCount="4" thresholdWindow="10" thresholdAction="terminate" /> -->
<collectionProcessCompleteErrors additionalErrorAction="terminate" />
</asyncPrimitiveErrorConfiguration>
</analysisEngine>
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-camel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-as-camel:941450-944450
+/uima/uima-as/trunk/uimaj-as-camel:961335-961754
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-as-core:941450-944450
+/uima/uima-as/trunk/uimaj-as-core:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-as-jms:941450-944450
+/uima/uima-as/trunk/uimaj-as-jms:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-osgi-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime:941450-944450
+/uima/uima-as/trunk/uimaj-as-osgi-runtime:961335-961754
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -0,0 +1 @@
+/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor:941450-944450
+/uima/uima-as/trunk/uimaj-ep-deployeditor:961335-961755
Propchange: uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-runtime-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:30:13 2010
@@ -1 +1,2 @@
/uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor:941450-944450
+/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor:961335-961755