svn commit: r1849399 [1/2] - in /uima/uv3/uima-as-v3/trunk/uimaj-as-activemq: ./ src/main/java/org/apache/uima/adapter/jms/activemq/ src/main/java/org/apache/uima/adapter/jms/client/ src/main/java/org

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:40:58 2018
New Revision: 1849399

URL: http://svn.apache.org/viewvc?rev=1849399=rev
Log:
[UIMA-5937] update pom version and scm, merge v2 updates, record merge

Added:

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/PriorityMessageHandler.java
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/PriorityMessageHandler.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDOCTYPE.xml
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorWithDOCTYPE.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AsyncAggregateWithJmsService.xml
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_AsyncAggregateWithJmsService.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithTargetingSupport.xml
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorWithTargetingSupport.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpAnnotatorWithTargetingSupport.xml
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpAnnotatorWithTargetingSupport.xml
Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/   (props changed)
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/pom.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/ConcurrentMessageListener.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/examples/as/RunRemoteAsyncAE.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpCC.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/ActiveMQSupport.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpAnnotatorWith2SecDelay.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/NoOpAnnotatorWith5SecDelay.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregate.xml

Propchange: uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:40:58 2018
@@ -1,2 +1,3 @@
 /uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq:961335-961760
 /uima/uima-as/branches/mavenAlign/uimaj-as-activemq:941450-944450
+/uima/uima-as/trunk/uimaj-as-activemq:1786000-1846917

Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/pom.xml?rev=1849399=1849398=1849399=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/pom.xml Thu Dec 20 14:40:58 2018
@@ -15,7 +15,7 @@

org.apache.uima
uima-as-parent
-   3.0.0-SNAPSHOT
+   3.0.1-SNAPSHOT
../uima-as-parent/pom.xml

 
@@ -31,13 +31,13 @@
cutting/pasting the  element, and just changing the 
following two properties -->


-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-activemq
+  

svn commit: r1849399 [2/2] - in /uima/uv3/uima-as-v3/trunk/uimaj-as-activemq: ./ src/main/java/org/apache/uima/adapter/jms/activemq/ src/main/java/org/apache/uima/adapter/jms/client/ src/main/java/org

2018-12-20 Thread schor
Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java?rev=1849399=1849398=1849399=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java
 Thu Dec 20 14:40:58 2018
@@ -23,6 +23,7 @@ import java.io.FileNotFoundException;
 
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.UimaContext;
+import org.apache.uima.aae.client.UimaAsynchronousEngine;
 import org.apache.uima.analysis_component.CasAnnotator_ImplBase;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
@@ -44,9 +45,14 @@ public class NoOpAnnotator extends CasAn
 
   int cpcDelay = 0;
 
+  boolean addServiceTargetId = false;
+  
+  private String thisServiceTargetId = null;
   public void initialize(UimaContext aContext) throws 
ResourceInitializationException {
 super.initialize(aContext);
-
+// this can be null. The TargetSelectorProperty is optional
+thisServiceTargetId = 
System.getProperty(UimaAsynchronousEngine.TargetSelectorProperty);
+
 if (getContext().getConfigParameterValue("FailDuringInitialization") != 
null) {
   throw new ResourceInitializationException(new 
FileNotFoundException("Simulated Exception"));
 }
@@ -71,6 +77,9 @@ public class NoOpAnnotator extends CasAn
 if (getContext().getConfigParameterValue("FinalCount") != null) {
   finalCount = ((Integer) 
getContext().getConfigParameterValue("FinalCount")).intValue();
 }
+if (getContext().getConfigParameterValue("addServiceTargetId") != null) {
+addServiceTargetId = ((Boolean) 
getContext().getConfigParameterValue("addServiceTargetId")).booleanValue();
+  }
 
 // write log messages
 Logger logger = getContext().getLogger();
@@ -132,6 +141,10 @@ public class NoOpAnnotator extends CasAn
   throw new IndexOutOfBoundsException();
 }
   }
+  if ( addServiceTargetId && thisServiceTargetId != null) {
+ aCAS.setDocumentText(thisServiceTargetId);
+  }
+ 
 } catch (Exception e) {
   throw new AnalysisEngineProcessException(e);
 }

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpCC.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpCC.java?rev=1849399=1849398=1849399=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpCC.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpCC.java
 Thu Dec 20 14:40:58 2018
@@ -31,7 +31,7 @@ public class NoOpCC extends CasConsumer_
   }
 
   public void processCas(CAS aCAS) throws ResourceProcessException {
-System.out.println("NoOpCC process() called");
+//System.out.println("NoOpCC process() called");
   }
 
 }

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=1849399=1849398=1849399=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
 Thu Dec 20 14:40:58 2018
@@ -33,12 +33,16 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -84,6 +88,7 @@ import org.apache.uima.resource.Resource
 import org.apache.uima.resource.ResourceProcessException;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
+import org.apache.uima.resource.metadata.TypePriorityList;
 import org.apache.uima.resourceSpecifier.factory.DeploymentDescriptorFactory;
 import org.apache.uima.resourceSpecifier.factory.ServiceContext;
 import 

svn commit: r1849405 - /uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 15:30:43 2018
New Revision: 1849405

URL: http://svn.apache.org/viewvc?rev=1849405=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml?rev=1849405=1849404=1849405=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor/pom.xml Thu Dec 20 15:30:43 
2018
@@ -23,7 +23,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
 
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->  
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-ep-deployeditor
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-ep-deployeditor
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor
 
 
-  http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-ep-deployeditor
 
   
   




svn commit: r1849406 - /uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 15:31:15 2018
New Revision: 1849406

URL: http://svn.apache.org/viewvc?rev=1849406=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=1849406=1849405=1849406=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor/pom.xml Thu Dec 20 
15:31:15 2018
@@ -23,7 +23,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
 
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->  
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor
 
 
-  
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-ep-runtime-deployeditor
 
   
   




svn commit: r1849407 - /uima/uv3/uima-as-v3/trunk/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 15:31:37 2018
New Revision: 1849407

URL: http://svn.apache.org/viewvc?rev=1849407=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/pom.xml?rev=1849407=1849406=1849407=diff
==
--- uima/uv3/uima-as-v3/trunk/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/pom.xml Thu Dec 20 15:31:37 2018
@@ -28,7 +28,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 uima-as-parent/pom.xml
   
 
@@ -48,13 +48,13 @@
element, and just changing the following two properties -->
   
 
-  scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk
+  scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk
 
 
-  scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk
+  scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk
 
 
-  http://svn.apache.org/viewvc/uima/uima-as/trunk
+  http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk
 
   
 




svn commit: r1849400 - in /uima/uv3/uima-as-v3/trunk/uimaj-as-camel: ./ pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:47:54 2018
New Revision: 1849400

URL: http://svn.apache.org/viewvc?rev=1849400=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-camel/   (props changed)
uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml

Propchange: uima/uv3/uima-as-v3/trunk/uimaj-as-camel/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:47:54 2018
@@ -1,2 +1,3 @@
 /uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-camel:961335-961760
 /uima/uima-as/branches/mavenAlign/uimaj-as-camel:941450-944450
+/uima/uima-as/trunk/uimaj-as-camel:1786000-1846917

Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml?rev=1849400=1849399=1849400=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-camel/pom.xml Thu Dec 20 14:47:54 2018
@@ -15,7 +15,7 @@

org.apache.uima
uima-as-parent
-   3.0.0-SNAPSHOT
+   3.0.1-SNAPSHOT
../uima-as-parent/pom.xml

 
@@ -32,13 +32,13 @@
cutting/pasting the  element, and just changing the 
following two properties -->


-  scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-camel
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
 

-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-camel
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
 

-  http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel
+  http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-camel
 

 




svn commit: r1849373 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java

2018-12-20 Thread pkluegl
Author: pkluegl
Date: Thu Dec 20 11:43:39 2018
New Revision: 1849373

URL: http://svn.apache.org/viewvc?rev=1849373=rev
Log:
UIMA-5258: added test

Modified:

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java

Modified: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java?rev=1849373=1849372=1849373=diff
==
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java
 Thu Dec 20 11:43:39 2018
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -35,10 +36,18 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.fit.factory.AnalysisEngineFactory;
 import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
 import org.apache.uima.fit.util.CasUtil;
+import org.apache.uima.fit.util.JCasUtil;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.ruta.descriptor.RutaBuildOptions;
+import org.apache.uima.ruta.descriptor.RutaDescriptorFactory;
+import org.apache.uima.ruta.descriptor.RutaDescriptorInformation;
 import org.apache.uima.ruta.engine.RutaEngine;
+import org.apache.uima.ruta.type.FalsePositive;
+import org.apache.uima.ruta.type.TruePositive;
 import org.apache.uima.util.InvalidXMLException;
+import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -46,25 +55,28 @@ import org.junit.Test;
  */
 public class ImportStatementsTest {
   private final String NAME = this.getClass().getSimpleName();
+
   private final String NAMESPACE = 
this.getClass().getPackage().getName().replaceAll("\\.", "/");
 
   /**
* Create an analysis engine for a Ruta script.
*
-   * @param script   Script path.
-   * @param strictImport {@link 
org.apache.uima.ruta.engine.RutaEngine#PARAM_STRICT_IMPORTS} value.
+   * @param script
+   *  Script path.
+   * @param strictImport
+   *  {@link 
org.apache.uima.ruta.engine.RutaEngine#PARAM_STRICT_IMPORTS} value.
* @return Analysis engine.
*/
-  private AnalysisEngine createAE(String script, boolean strictImport) throws 
ResourceInitializationException, IOException, InvalidXMLException {
+  private AnalysisEngine createAE(String script, boolean strictImport)
+  throws ResourceInitializationException, IOException, 
InvalidXMLException {
 final TypeSystemDescription tsd = 
TypeSystemDescriptionFactory.createTypeSystemDescription(
-"org.apache.uima.ruta.engine.BasicTypeSystem",
-"org.apache.uima.ruta.ImportStatementsTestTypeSystem",
-
"org.apache.uima.ruta.ImportStatementsTestTypeSystemWithAmbiguousShortNames",
-"org.apache.uima.ruta.ImportStatementsTestTypeSystemWithManyPackages");
+"org.apache.uima.ruta.engine.BasicTypeSystem",
+"org.apache.uima.ruta.ImportStatementsTestTypeSystem",
+
"org.apache.uima.ruta.ImportStatementsTestTypeSystemWithAmbiguousShortNames",
+
"org.apache.uima.ruta.ImportStatementsTestTypeSystemWithManyPackages");
 final AnalysisEngineDescription ruta = 
AnalysisEngineFactory.createEngineDescription(
-"org.apache.uima.ruta.engine.BasicEngine",
-RutaEngine.PARAM_MAIN_SCRIPT, script,
-RutaEngine.PARAM_STRICT_IMPORTS, strictImport);
+"org.apache.uima.ruta.engine.BasicEngine", 
RutaEngine.PARAM_MAIN_SCRIPT, script,
+RutaEngine.PARAM_STRICT_IMPORTS, strictImport);
 
 ruta.getAnalysisEngineMetaData().setTypeSystem(tsd);
 
@@ -241,7 +253,8 @@ public class ImportStatementsTest {
 
   @Test
   public void testImportAllPackagesWithAliasFromTypeSystem() throws Exception {
-AnalysisEngine ae = createAE(NAMESPACE + "/" + NAME + 
"ImportAllPackagesWithAliasFromTypeSystem", true);
+AnalysisEngine ae = createAE(
+NAMESPACE + "/" + NAME + 
"ImportAllPackagesWithAliasFromTypeSystem", true);
 try {
   CAS cas = ae.newCAS();
   cas.setDocumentText("First Second");
@@ -256,7 +269,9 @@ public class ImportStatementsTest {
 
   @Test
   public void testImportAllPackagesFromTypeSystemWithAmbiguousShortNames() 
throws Exception {
-AnalysisEngine ae = createAE(NAMESPACE + "/" + NAME + 
"ImportAllPackagesFromTypeSystemWithAmbiguousShortNames", true);
+AnalysisEngine ae = createAE(
+NAMESPACE + "/" + NAME + 

svn commit: r1849397 - in /uima/uv3/uima-as-v3/trunk/uima-as-docbooks: ./ pom.xml src/docbook/async.monitoring.and.tuning.xml src/docbook/async.tools.xml src/docbook/ref.async.api.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:36:56 2018
New Revision: 1849397

URL: http://svn.apache.org/viewvc?rev=1849397=rev
Log:
[UIMA-5937] update pom version and scm, merge doc updates, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/   (props changed)
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/pom.xml

uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.tools.xml
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml

Propchange: uima/uv3/uima-as-v3/trunk/uima-as-docbooks/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:36:56 2018
@@ -1,2 +1,3 @@
 /uima/uima-as/branches/depend-on-parent-pom-4/uima-as-docbooks:961335-961760
 /uima/uima-as/branches/mavenAlign/uima-as-docbooks:941450-944455
+/uima/uima-as/trunk/uima-as-docbooks:1786000-1846922

Modified: uima/uv3/uima-as-v3/trunk/uima-as-docbooks/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-docbooks/pom.xml?rev=1849397=1849396=1849397=diff
==
--- uima/uv3/uima-as-v3/trunk/uima-as-docbooks/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uima-as-docbooks/pom.xml Thu Dec 20 14:36:56 2018
@@ -24,7 +24,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
   
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->  
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-docbooks
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-docbooks
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-docbooks
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-docbooks
 
 
-  http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks
+  http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-docbooks
 
   
   

Modified: 
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml?rev=1849397=1849396=1849397=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
 Thu Dec 20 14:36:56 2018
@@ -896,7 +896,7 @@ under the License.
 
   
   
-Disabling JMX in UIMA-AS
+Disabling JMX in UIMA-AS JUnit tests
When opening JMX RMI port is not possible due to security 
concerns, the UIMA-AS can start
without JMX support. To disable JMX please add the following as a JVM 
argument -Duima.as.enable.jmx=false 


Modified: uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.tools.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.tools.xml?rev=1849397=1849396=1849397=diff
==
--- uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.tools.xml 
(original)
+++ uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/async.tools.xml Thu 
Dec 20 14:36:56 2018
@@ -99,6 +99,9 @@ under the License.
 -uimaEeDebug true causes various debugging things to 
happen, including 
 not deleting the generated spring file generated 
by running dd2spring. 
 This parameter only affects deployments specified using the -d 
parameter that follow it in the command line sequence.
+-TargetServiceId specifies identifier of a service 
which should process a CAS. This
+identifier must match service's identifier. By default a service is 
launched with an IP:PID
+identifier but the identifier can be an arbitrary 
String.
   
 
 The source code for this is in the class 

Modified: 
uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml?rev=1849397=1849396=1849397=diff
==
--- uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml 
(original)
+++ uima/uv3/uima-as-v3/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml 
Thu Dec 20 14:36:56 2018
@@ -69,6 +69,7 @@ under the License.
   optionally be launched as separate processes on the same machine. In 
either case logging
   and JMX monitoring for native services are integrated with the other 
UIMA components in the JVM.
 
+
 
   
   
@@ -85,7 

svn commit: r1849398 - in /uima/uv3/uima-as-v3/trunk: aggregate-uima-as-eclipse-plugins/pom.xml aggregate-uima-as/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:37:38 2018
New Revision: 1849398

URL: http://svn.apache.org/viewvc?rev=1849398=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uv3/uima-as-v3/trunk/aggregate-uima-as/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=1849398=1849397=1849398=diff
==
--- uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins/pom.xml 
(original)
+++ uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Thu Dec 
20 14:37:38 2018
@@ -23,7 +23,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
 
@@ -44,13 +44,13 @@
element, and just changing the following two properties -->
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins
 
 
-  
http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/aggregate-uima-as-eclipse-plugins
 
   
 

Modified: uima/uv3/uima-as-v3/trunk/aggregate-uima-as/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/aggregate-uima-as/pom.xml?rev=1849398=1849397=1849398=diff
==
--- uima/uv3/uima-as-v3/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/aggregate-uima-as/pom.xml Thu Dec 20 14:37:38 2018
@@ -24,7 +24,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
 
@@ -46,13 +46,13 @@
element, and just changing the following two properties -->
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/aggregate-uima-as
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/aggregate-uima-as
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/aggregate-uima-as
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/aggregate-uima-as
 
 
-  http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as
+  http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/aggregate-uima-as
 
   
 




svn commit: r1849402 - in /uima/uv3/uima-as-v3/trunk/uimaj-as-jms: ./ src/main/java/org/apache/uima/adapter/jms/client/ src/main/java/org/apache/uima/adapter/jms/message/ src/main/java/org/apache/uima

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:51:16 2018
New Revision: 1849402

URL: http://svn.apache.org/viewvc?rev=1849402=rev
Log:
[UIMA-5937] update pom version and scm, merge v2 updates, record merge

Added:

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/UimaAsClientStoppingException.java
  - copied unchanged from r1846915, 
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/UimaAsClientStoppingException.java
Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-jms/   (props changed)
uima/uv3/uima-as-v3/trunk/uimaj-as-jms/pom.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/ClientServiceDelegate.java

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/PendingMessage.java

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java

uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties

Propchange: uima/uv3/uima-as-v3/trunk/uimaj-as-jms/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:51:16 2018
@@ -1,2 +1,3 @@
 /uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-jms:961335-961760
 /uima/uima-as/branches/mavenAlign/uimaj-as-jms:941450-944450
+/uima/uima-as/trunk/uimaj-as-jms:1786000-1846915

Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-jms/pom.xml?rev=1849402=1849401=1849402=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-jms/pom.xml Thu Dec 20 14:51:16 2018
@@ -15,7 +15,7 @@

org.apache.uima
uima-as-parent
-   3.0.0-SNAPSHOT
+   3.0.1-SNAPSHOT
../uima-as-parent/pom.xml

 
@@ -30,13 +30,13 @@
cutting/pasting the  element, and just changing the 
following two properties -->


-  scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-jms
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-jms
 

-  scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-jms
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-jms
 

-  http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms
+  http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-jms
 

 

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java?rev=1849402=1849401=1849402=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
 Thu Dec 20 14:51:16 2018
@@ -20,6 +20,7 @@
 package org.apache.uima.adapter.jms.client;
 
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.jms.Connection;
@@ -85,7 +86,9 @@ public abstract class BaseMessageSender
 
   // Releases resources
   protected abstract void cleanup() throws Exception;
-
+  
+  protected abstract void dispatchMessage(PendingMessage pm, 
BaseUIMAAsynchronousEngineCommon_impl engine, boolean casProcessRequest ) 
throws Exception;
+ 
   // Returns the name of the destination
   protected abstract String getDestinationEndpoint() throws Exception;
 
@@ -93,6 +96,7 @@ public abstract class BaseMessageSender
   
   private MessageProducer producer = null;
   
+  private CountDownLatch stopLatch = new CountDownLatch(1);
 
   public BaseMessageSender(BaseUIMAAsynchronousEngineCommon_impl anEngine) {
 messageQueue = anEngine.pendingMessageQueue;
@@ -110,9 +114,32 @@ public abstract class BaseMessageSender
*/
   public void doStop() {
 done = true;
+
 // Create an empty message to deliver to the queue that is blocking
 PendingMessage emptyMessage = new PendingMessage(0);
+
+messageQueue.add(emptyMessage);
+synchronized(emptyMessage) {
+   try {
+   emptyMessage.wait(200);
+   } catch( 

svn commit: r1849403 - /uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:51:59 2018
New Revision: 1849403

URL: http://svn.apache.org/viewvc?rev=1849403=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml?rev=1849403=1849402=1849403=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime/pom.xml Thu Dec 20 14:51:59 
2018
@@ -23,7 +23,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
   
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->  
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-osgi-runtime
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-as-osgi-runtime
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime
 
 
-  http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-osgi-runtime
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-osgi-runtime
 
   
   




svn commit: r1849370 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java

2018-12-20 Thread pkluegl
Author: pkluegl
Date: Thu Dec 20 11:04:12 2018
New Revision: 1849370

URL: http://svn.apache.org/viewvc?rev=1849370=rev
Log:
UIMA-5414: fixed param in test

Modified:

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java

Modified: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java?rev=1849370=1849369=1849370=diff
==
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
 Thu Dec 20 11:04:12 2018
@@ -112,7 +112,7 @@ public class RutaEngineTest {
 String script = "W;";
 
 AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class, 
RutaEngine.PARAM_RULES,
-script, RutaEngine.PARAM_MAX_RULE_MATCHES, Long.valueOf(2));
+script, RutaEngine.PARAM_MAX_RULE_MATCHES, Integer.valueOf(2));
 
 CAS cas = RutaTestUtils.getCAS(document);
 
@@ -135,7 +135,7 @@ public class RutaEngineTest {
 String script = "W+;";
 
 AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class, 
RutaEngine.PARAM_RULES,
-script, RutaEngine.PARAM_MAX_RULE_ELEMENT_MATCHES, 
Long.valueOf(2));
+script, RutaEngine.PARAM_MAX_RULE_ELEMENT_MATCHES, 
Integer.valueOf(2));
 
 CAS cas = RutaTestUtils.getCAS(document);
 




svn commit: r1849401 [2/2] - in /uima/uv3/uima-as-v3/trunk/uimaj-as-core: ./ src/main/java/org/apache/uima/aae/ src/main/java/org/apache/uima/aae/client/ src/main/java/org/apache/uima/aae/controller/

2018-12-20 Thread schor
Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java?rev=1849401=1849400=1849401=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java
 Thu Dec 20 14:50:11 2018
@@ -25,14 +25,10 @@ public class PrimitiveServiceInfo extend

   // ServiceInfoMBean
 // extends ServiceInfo implements PrimitiveServiceInfoMBean//, ServiceInfoMBean
 {
-  /**
-* 
-*/
+ 
   private static final long serialVersionUID = -6416623322329673083L;
  
-  /**
-* 
-*/
+ 
   public PrimitiveServiceInfo(boolean isaCasMultiplier, 
AnalysisEngineController controller ) {
 super(isaCasMultiplier, controller);
   }

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java?rev=1849401=1849400=1849401=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java
 Thu Dec 20 14:50:11 2018
@@ -154,7 +154,7 @@ public class ServicePerformance implemen
* delegate. Each reply message containing a CAS include the current actual 
analysis time This is
* not a delta, its the running analysis time.
* 
-   * @param anAnalysisTime
+   * @param anAnalysisTime analysis time
*/
   public synchronized void setAnalysisTime(long anAnalysisTime) {
 analysisTime = anAnalysisTime;

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java?rev=1849401=1849400=1849401=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
 Thu Dec 20 14:50:11 2018
@@ -23,7 +23,7 @@ import org.apache.uima.aae.jmx.monitor.S
 public interface JmxMonitorListener {
   /**
* Provides metrics for all UIMA AS services collected during a checkpoint. 
This method is called
-   * by the {@link org.apache.uima.aae.jmx.monitor.JmxMonitor} after each 
checkpoint with the latest metrics. The metrics are deltas
+   * by the { org.apache.uima.aae.jmx.monitor.JmxMonitor} after each 
checkpoint with the latest metrics. The metrics are deltas
* except for queue depth attribute.
* 
* @param sampleTime

Modified: 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java?rev=1849401=1849400=1849401=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
 Thu Dec 20 14:50:11 2018
@@ -20,6 +20,8 @@
 package org.apache.uima.aae.message;
 
 public interface AsynchAEMessage {
+  //public static final String TargetSelectorProperty ="TargetServiceId";
+  
   public static final String TotalTimeSpentInAnalytic = "TimeInAnalytic";
 
   public static final String TimeInService = "TimeInService";
@@ -35,6 +37,8 @@ public interface AsynchAEMessage {
   public static final String InputCasReference = "InputCasReference";
 
   public static final String MessageFrom = "MessageFrom";
+  
+  public static final String Destination = "Destination";
 
   // 5/2013 xcas not used as a serialization form
 //  public static final String XCASREFId = "XCASRefId";
@@ -149,4 +153,6 @@ public interface AsynchAEMessage {
   public static final String ErrorCause = "Cause";
 
   public static final int PingTimeout = 5001;
+  
+  public static final String TargetingSelector = "TargetingSelector";
 }

Modified: 

svn commit: r1849401 [1/2] - in /uima/uv3/uima-as-v3/trunk/uimaj-as-core: ./ src/main/java/org/apache/uima/aae/ src/main/java/org/apache/uima/aae/client/ src/main/java/org/apache/uima/aae/controller/

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:50:11 2018
New Revision: 1849401

URL: http://svn.apache.org/viewvc?rev=1849401=rev
Log:
[UIMA-5937] update pom version and scm, merge v2 updates, record merge

Added:

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UimaAsPriorityBasedThreadFactory.java
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UimaAsPriorityBasedThreadFactory.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/MessageWrapper.java
  - copied unchanged from r1846917, 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/MessageWrapper.java
Modified:
uima/uv3/uima-as-v3/trunk/uimaj-as-core/   (props changed)
uima/uv3/uima-as-v3/trunk/uimaj-as-core/pom.xml

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/InProcessCache.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/ParallelStep.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UimaAsThreadFactory.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UimaClassFactory.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/UimaSerializer.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsBaseCallbackListener.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsynchronousEngine.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineInstancePool.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/CpcErrorHandler.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/AggregateServiceInfo.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/JmxManagement.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/JmxManager.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaEEShutdownTriggerEvent.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaMessageValidator.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java

uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties

Propchange: uima/uv3/uima-as-v3/trunk/uimaj-as-core/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 14:50:11 2018
@@ -1,2 +1,3 @@
 /uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-core:961335-961760
 /uima/uima-as/branches/mavenAlign/uimaj-as-core:941450-944450

svn commit: r1849396 - /uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:34:23 2018
New Revision: 1849396

URL: http://svn.apache.org/viewvc?rev=1849396=rev
Log:
[UIMA-5937] record merge

Modified:
uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/   (props changed)

Propchange: uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec 20 14:34:23 2018
@@ -0,0 +1 @@
+/uima/uima-as/trunk/uima-as-eclipse-update-site:1786000-1846920




svn commit: r1849395 - /uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:33:33 2018
New Revision: 1849395

URL: http://svn.apache.org/viewvc?rev=1849395=rev
Log:
[UIMA-5937] remove v2 versions of plugins (the v3 plugins are in a separate 
spot), update the label to say version 3

Modified:

uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml

Modified: 
uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml?rev=1849395=1849394=1849395=diff
==
--- 
uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml
 (original)
+++ 
uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/src/main/resources/category.xml
 Thu Dec 20 14:33:33 2018
@@ -17,15 +17,11 @@
specific language governing permissions and limitations
under the License.
 -->
+
 
-   
-  
-   
-   
-  
-   
+   

   

-   
+   
 




svn commit: r1849394 - /uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 14:12:46 2018
New Revision: 1849394

URL: http://svn.apache.org/viewvc?rev=1849394=rev
Log:
[UIMA-5937] change to v 3.0.1. remove redundant version. fix scm connection to 
the uv3/uima-as-v3/trunk. make feature target name have the .as. part. (same as 
v2)

Modified:
uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml?rev=1849394=1849393=1849394=diff
==
--- uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml (original)
+++ uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site/pom.xml Thu Dec 20 
14:12:46 2018
@@ -24,13 +24,12 @@
 
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
   
   uima-as-eclipse-update-site
   pom
-  3.0.0-SNAPSHOT
 
   Apache UIMA Eclipse: ${project.artifactId}
   The UIMA Eclipse update site
@@ -38,13 +37,13 @@
 
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-eclipse-update-site
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uima-as-eclipse-update-site
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site
 
 
-  
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-eclipse-update-site
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uima-as-eclipse-update-site
 
   
 
@@ -134,7 +133,7 @@
org.apache.uima
uimaj-eclipse-feature-deployeditor
${project.version}
-   
org.apache.uima.deployeditor_${parsedVersion.osgiVersion}.jar
+   
org.apache.uima.as.deployeditor_${parsedVersion.osgiVersion}.jar
 
  
   




svn commit: r1849404 - /uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 15:29:43 2018
New Revision: 1849404

URL: http://svn.apache.org/viewvc?rev=1849404=rev
Log:
[UIMA-5937] update pom version and scm, record merge

Modified:
uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml

Modified: uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=1849404=1849403=1849404=diff
==
--- uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml 
(original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Thu 
Dec 20 15:29:43 2018
@@ -23,7 +23,7 @@
   
 org.apache.uima
 uima-as-parent
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ../uima-as-parent/pom.xml
   
   
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->  
   
 
-  
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor
+  
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor
 
 
-  
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor
+  
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor
 
 
-  
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor
+  
http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-eclipse-feature-deployeditor
 
   
   




svn commit: r1849439 - in /uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm: container/deployer/RunnableApplication.java utils/Execute.java

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 21:37:54 2018
New Revision: 1849439

URL: http://svn.apache.org/viewvc?rev=1849439=rev
Log:
no Jira, apply #3 pull request to fix spelling errors in comments / docs

Modified:

uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java

uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java

Modified: 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java?rev=1849439=1849438=1849439=diff
==
--- 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
 Thu Dec 20 21:37:54 2018
@@ -49,7 +49,7 @@ public class RunnableApplication {
   private Properties sysEnvVars = null;
 
   /**
-   * Sets up command line used to launch Cas Processor in a seperate process. 
Combines environment
+   * Sets up command line used to launch Cas Processor in a separate process. 
Combines environment
* variables setup in the CPE descriptor with a System environment variables.
* 
* @param aCasProcessorConfiguration -

Modified: 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java?rev=1849439=1849438=1849439=diff
==
--- 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
 Thu Dec 20 21:37:54 2018
@@ -20,7 +20,7 @@
 package org.apache.uima.collection.impl.cpm.utils;
 
 /**
- * Contains command line and environment for launching a seperate process.
+ * Contains command line and environment for launching a separate process.
  * 
  * 
  */




svn commit: r1849442 - in /uima/uv3/uimaj-v3/trunk/uimaj-cpe: ./ src/main/java/org/apache/uima/collection/impl/cpm/container/ src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/ src/

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 21:44:41 2018
New Revision: 1849442

URL: http://svn.apache.org/viewvc?rev=1849442=rev
Log:
no Jira, merge 3 spelling fixes in comments from v2

Modified:
uima/uv3/uimaj-v3/trunk/uimaj-cpe/   (props changed)

uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/
   (props changed)

uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java

uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java

uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java

Propchange: uima/uv3/uimaj-v3/trunk/uimaj-cpe/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 21:44:41 2018
@@ -3,4 +3,4 @@
 /uima/uimaj/branches/depend-on-parent-pom-4/uimaj-cpe:961329-961747
 /uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe:1436573-1462257
 /uima/uimaj/branches/mavenAlign/uimaj-cpe:933273-944399
-/uima/uimaj/trunk/uimaj-cpe:1690273-1768794,1782535
+/uima/uimaj/trunk/uimaj-cpe:1690273-1849440

Propchange: 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/
('svn:mergeinfo' removed)

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java?rev=1849442=1849441=1849442=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
 Thu Dec 20 21:44:41 2018
@@ -59,7 +59,7 @@ public class RunnableApplication {
   private Properties sysEnvVars = null;
 
   /**
-   * Sets up command line used to launch Cas Processor in a seperate process. 
Combines environment
+   * Sets up command line used to launch Cas Processor in a separate process. 
Combines environment
* variables setup in the CPE descriptor with a System environment variables.
*
* @param aCasProcessorConfiguration -

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java?rev=1849442=1849441=1849442=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
 Thu Dec 20 21:44:41 2018
@@ -1148,7 +1148,7 @@ public void asynchStop() {
   /**
* Classify based on Cas Processor capability to run in parallel. Some Cas 
Processors need to run
* as single instance only. It scans the list of Cas Processors backwords 
and moves those Cas
-   * Processors that are not parallelizable to a separate single-threade 
pipeline. This process of
+   * Processors that are not parallelizable to a separate single-thread 
pipeline. This process of
* moving CPs continues until the first parallelizable Cas Processor is 
found. Beyond this all Cas
* Processors are moved to a parallelizable pipeline. If the 
non-parallelizable CP is in the
* parallelizable pipeline there simply will be a single instance of it that 
will be shared by all

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java?rev=1849442=1849441=1849442=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Execute.java
 Thu Dec 20 21:44:41 2018
@@ -21,7 +21,7 @@ package org.apache.uima.collection.impl.
 
 
 /**
- * Contains command line and environment for launching a seperate process.
+ * Contains command line and environment for launching a separate process.
  * 
  * 
  */




svn commit: r1849443 - /uima/uv3/uimaj-v3/trunk/uima-docbook-references/

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 21:50:04 2018
New Revision: 1849443

URL: http://svn.apache.org/viewvc?rev=1849443=rev
Log:
no jira, update merge info only

Modified:
uima/uv3/uimaj-v3/trunk/uima-docbook-references/   (props changed)

Propchange: uima/uv3/uimaj-v3/trunk/uima-docbook-references/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 20 21:50:04 2018
@@ -1,4 +1,4 @@
 
/uima/uimaj/branches/depend-on-july-9-build-tools/uima-docbook-references:963167-964468
 
/uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references:961329-961745
 
/uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references:1436573-1462257
-/uima/uimaj/trunk/uima-docbook-references:1690273-1835941
+/uima/uimaj/trunk/uima-docbook-references:1690273-1849442




svn commit: r1849440 - /uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml

2018-12-20 Thread schor
Author: schor
Date: Thu Dec 20 21:38:24 2018
New Revision: 1849440

URL: http://svn.apache.org/viewvc?rev=1849440=rev
Log:
no Jira, apply #3 pull request to fix spelling errors in comments / docs

Modified:
uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml

Modified: uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml?rev=1849440=1849439=1849440=diff
==
--- uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml 
(original)
+++ uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.config.xml Thu Dec 
20 21:38:24 2018
@@ -220,7 +220,7 @@ under the License.
   Updates that occur next-to trace information for the same 
Feature Structure are combined.
   

-  This can generate a lot of output, and definately 
slows down execution.
+  This can generate a lot of output, and definitely 
slows down execution.
 
 
 2.10.1




svn commit: r1849363 - in /uima/ruta/trunk: ruta-core/src/main/java/org/apache/uima/ruta/ ruta-core/src/main/java/org/apache/uima/ruta/engine/ ruta-core/src/main/java/org/apache/uima/ruta/rule/ ruta-c

2018-12-20 Thread pkluegl
Author: pkluegl
Date: Thu Dec 20 08:30:47 2018
New Revision: 1849363

URL: http://svn.apache.org/viewvc?rev=1849363=rev
Log:
UIMA-5414: added two params+impl, added test, added doc mention

Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ConjunctRulesRuleElement.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RegExpRule.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleApply.java

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1849363=1849362=1849363=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java 
(original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java 
Thu Dec 20 08:30:47 2018
@@ -130,6 +130,10 @@ public class RutaStream extends FSIterat
 
   private boolean emptyIsInvisible;
 
+  private long maxRuleMatches;
+
+  private long maxRuleElementMatches;
+
   public RutaStream(CAS cas, Type basicType, FilterManager filter, boolean 
lowMemoryProfile,
   boolean simpleGreedyForComposed, boolean emptyIsInvisible, 
TypeUsageInformation typeUsage,
   InferenceCrowd crowd) {
@@ -484,6 +488,8 @@ public class RutaStream extends FSIterat
 stream.setDynamicAnchoring(dynamicAnchoring);
 stream.setGreedyRuleElement(greedyRuleElement);
 stream.setGreedyRule(greedyRule);
+stream.setMaxRuleMatches(maxRuleMatches);
+stream.setMaxRuleElementMatches(maxRuleElementMatches);
 return stream;
   }
 
@@ -494,6 +500,8 @@ public class RutaStream extends FSIterat
 stream.setDynamicAnchoring(dynamicAnchoring);
 stream.setGreedyRuleElement(greedyRuleElement);
 stream.setGreedyRule(greedyRule);
+stream.setMaxRuleMatches(maxRuleMatches);
+stream.setMaxRuleElementMatches(maxRuleElementMatches);
 return stream;
   }
 
@@ -1353,4 +1361,20 @@ public class RutaStream extends FSIterat
 }
 return null;
   }
+
+  public void setMaxRuleMatches(long maxRuleMatches) {
+this.maxRuleMatches = maxRuleMatches;
+  }
+
+  public void setMaxRuleElementMatches(long maxRuleElementMatches) {
+this.maxRuleElementMatches = maxRuleElementMatches;
+  }
+
+  public long getMaxRuleMatches() {
+return this.maxRuleMatches;
+  }
+
+  public long getMaxRuleElementMatches() {
+return this.maxRuleElementMatches;
+  }
 }

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1849363=1849362=1849363=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
 Thu Dec 20 08:30:47 2018
@@ -492,6 +492,24 @@ public class RutaEngine extends JCasAnno
   @ConfigurationParameter(name = PARAM_INFERENCE_VISITORS, mandatory = false, 
defaultValue = {})
   private String[] inferenceVisitors;
 
+  /**
+   * Maximum amount of allowed matches of a single rule.
+   */
+  public static final String PARAM_MAX_RULE_MATCHES = "maxRuleMatches";
+
+  @ConfigurationParameter(name = PARAM_MAX_RULE_MATCHES, mandatory = false, 
defaultValue = ""
+  + Integer.MAX_VALUE)
+  private int maxRuleMatches;
+
+  /**
+   * Maximum amount of allowed matches of a single rule element.
+   */
+  public static final String PARAM_MAX_RULE_ELEMENT_MATCHES = 
"maxRuleElementMatches";
+
+  @ConfigurationParameter(name = PARAM_MAX_RULE_ELEMENT_MATCHES, mandatory = 
false, defaultValue = ""
+  + Integer.MAX_VALUE)
+  private int maxRuleElementMatches;
+
   private UimaContext context;
 
   private RutaModule script;
@@ -578,6 +596,8 @@ public class RutaEngine extends JCasAnno
 stream.setDynamicAnchoring(dynamicAnchoring);
 stream.setGreedyRuleElement(greedyRuleElement);
 stream.setGreedyRule(greedyRule);
+stream.setMaxRuleMatches(maxRuleMatches);
+stream.setMaxRuleElementMatches(maxRuleElementMatches);
 try {
   script.apply(stream, crowd);
 } catch (Throwable e) {

Modified: