svn commit: r1679555 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/

2015-05-15 Thread challngr 
Author: challngr
Date: Fri May 15 12:43:58 2015
New Revision: 1679555

URL: http://svn.apache.org/r1679555
Log:
UIMA-4358 Serialize service start; don't start until previous instance is 
scheduled.
  Remove debugging code from CLI.
  Set default CAS small in pinger.

Modified:

uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java

uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsPing.java

uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java

uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1679555r1=1679554r2=1679555view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
 Fri May 15 12:43:58 2015
@@ -996,10 +996,6 @@ public class DuccServiceApi
  */
public static void main(String[] args) 
 {
-System.out.println(System.getProperty(java.vendor));
-System.out.println(System.getProperty(java.version));
-System.out.println(System.getProperty(java.home));
-
 boolean rc = false;
 try {
 switch ( getVerb(args) ) {

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsPing.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsPing.java?rev=1679555r1=1679554r2=1679555view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsPing.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsPing.java
 Fri May 15 12:43:58 2015
@@ -179,6 +179,7 @@ public class UimaAsPing
 appCtx.put(UimaAsynchronousEngine.ServerUri, broker);
 appCtx.put(UimaAsynchronousEngine.ENDPOINT, endpoint);
 appCtx.put(UimaAsynchronousEngine.GetMetaTimeout, meta_timeout);
+appCtx.put(UIMAFramework.CAS_INITIAL_HEAP_SIZE, 1000);
 
 ResourceInitializationException excp = null;
 gmfail = false;

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1679555r1=1679554r2=1679555view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
 Fri May 15 12:43:58 2015
@@ -134,6 +134,9 @@ public class ServiceHandler
 ListServiceSet services = serviceStateHandler.getServices();
 for ( ServiceSet sset : services ) {
 sset.bootComplete();
+if ( sset.countImplementors()  0 ) {// if something 
was running, let's make sure all the starts are done
+sset.start();
+}
 }
 }
 

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1679555r1=1679554r2=1679555view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
 Fri May 15 12:43:58 2015
@@ -480,7 +480,7 @@ public class ServiceSet
 si.setInstanceId(pending_instances.get(id.getFriendly())); // UIMA-4258
 
 handler.addInstance(this, si);
-pendingImplementors.put(id.getFriendly(), si);
+pendingImplementors.put(id.getFriendly(), si);// remember 
which instances we hear about in current OR publication
 }
 
 /**
@@ -488,13 +488,14 @@ public class ServiceSet
  */
 void bootComplete()
 {
+String methodName = bootComplete;
 //
 // During boot, inactive implementors are removed.  Here we cull the 
implementors list to
 // remove stuff that didn't come in.

svn commit: r1679650 - /uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java

2015-05-15 Thread schor 
Author: schor
Date: Fri May 15 21:34:41 2015
New Revision: 1679650

URL: http://svn.apache.org/r1679650
Log:
no Jira - add more dumping (under control of static boolean) for debugging

Modified:

uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java

Modified: 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java?rev=1679650r1=1679649r2=1679650view=diff
==
--- 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
 Fri May 15 21:34:41 2015
@@ -180,20 +180,31 @@ public class AnnotationIteratorTest exte
 FSIndexRepository ir = this.cas.getIndexRepository();
 int annotCount = 1; // Init with document annotation.
 // create token and sentence annotations
+AnnotationFS fs;
 for (int i = 0; i  text.length() - 5; i++) {
   ++annotCount;
-  ir.addFS(this.cas.createAnnotation(this.tokenType, i, i + 5));
+  ir.addFS(fs = this.cas.createAnnotation(this.tokenType, i, i + 5));
+  if (showFSs) {
+System.out.format(creating: %d begin: %d end: %d type: %s%n, 
annotCount, fs.getBegin(), fs.getEnd(), fs.getType().getName() );
+  }
 }
 // for (int i = 0; i  text.length() - 5; i++) {
 // cas.getIndexRepository().addFS(cas.createAnnotation(tokenType, i, i+5));
 // }
 for (int i = 0; i  text.length() - 10; i += 5) {
   ++annotCount;
-  ir.addFS(this.cas.createAnnotation(this.sentenceType, i, i + 10));
+  ir.addFS(fs = this.cas.createAnnotation(this.sentenceType, i, i + 10));
+  if (showFSs) {
+System.out.format(creating: %d begin: %d end: %d type: %s%n, 
annotCount, fs.getBegin(), fs.getEnd(), fs.getType().getName() );
+  }
 }
 
 ++annotCount;
-ir.addFS(this.cas.createAnnotation(this.sentenceType,  12, 31));
+ir.addFS(fs = this.cas.createAnnotation(this.sentenceType,  12, 31));
+if (showFSs) {
+  System.out.format(creating: %d begin: %d end: %d type: %s%n, 
annotCount, fs.getBegin(), fs.getEnd(), fs.getType().getName() );
+}
+
 
 /***
  * iterate over them