svn commit: r1848778 - in /uima/ruta/trunk: ruta-core/src/main/java/org/apache/uima/ruta/visitor/ ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ ruta-ep-addons/src/main/java/org/apache/uim

2018-12-12 Thread pkluegl 
Author: pkluegl
Date: Wed Dec 12 16:55:03 2018
New Revision: 1848778

URL: http://svn.apache.org/viewvc?rev=1848778=rev
Log:
UIMA-5468: started to include timestamp for sorting in ui

Modified:

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoCollectorVisitor.java

uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ExplainConstants.java

uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/tree/ExplainTree.java

uima/ruta/trunk/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoCollectorVisitor.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoCollectorVisitor.java?rev=1848778=1848777=1848778=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoCollectorVisitor.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoCollectorVisitor.java
 Wed Dec 12 16:55:03 2018
@@ -168,6 +168,7 @@ public class DebugInfoCollectorVisitor i
 
   DebugScriptApply debugScriptApply = 
debugFactory.createDebugScriptApply(rootApply, stream,
   false, withMatches, timeInfo);
+  debugScriptApply.setTimestamp(System.currentTimeMillis());
   debugScriptApply.addToIndexes();
 }
   }

Modified: 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ExplainConstants.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ExplainConstants.java?rev=1848778=1848777=1848778=diff
==
--- 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ExplainConstants.java
 (original)
+++ 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/ExplainConstants.java
 Wed Dec 12 16:55:03 2018
@@ -69,8 +69,10 @@ public class ExplainConstants {
   public static final String RULE_ANCHOR = "ruleAnchor";
 
   public static final String TIME = "time";
-  
+
+  public static final String TIME_STAMP = "timestamp";
+
   public static final String ID = "id";
-  
+
   public static final String SCRIPT = "script";
 }

Modified: 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/tree/ExplainTree.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/tree/ExplainTree.java?rev=1848778=1848777=1848778=diff
==
--- 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/tree/ExplainTree.java
 (original)
+++ 
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/tree/ExplainTree.java
 Wed Dec 12 16:55:03 2018
@@ -20,16 +20,18 @@
 package org.apache.uima.ruta.explain.tree;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.uima.cas.ArrayFS;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.FeatureStructure;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.fit.util.CasUtil;
 import org.apache.uima.ruta.explain.ExplainConstants;
 
 public class ExplainTree {
@@ -73,7 +75,7 @@ public class ExplainTree {
 
   private void createTree(CAS cas, int offset, boolean onlyRules) {
 TypeSystem ts = cas.getTypeSystem();
-Type scriptApply = ts.getType(ExplainConstants.SCRIPT_APPLY_TYPE);
+Type scriptApplyType = ts.getType(ExplainConstants.SCRIPT_APPLY_TYPE);
 
 blockApplyType = ts.getType(ExplainConstants.BLOCK_APPLY_TYPE);
 ruleApplyType = ts.getType(ExplainConstants.RULE_APPLY_TYPE);
@@ -84,20 +86,32 @@ public class ExplainTree {
 ruleElementMatchesType = 
ts.getType(ExplainConstants.RULE_ELEMENT_MATCHES_TYPE);
 evaluatedConditionType = ts.getType(ExplainConstants.EVAL_CONDITION_TYPE);
 
-if (scriptApply == null)
+if (scriptApplyType == null) {
   return;
-FSIterator it = 
cas.getAnnotationIndex(scriptApply).iterator();
-root = new ApplyRootNode(null, ts);
+}
 
-if (it.isValid()) {
-  it.moveToFirst();
-  while (it.isValid()) {
-AnnotationFS fs = it.get();
-buildTree(fs, root, ts, offset, onlyRules);
-it.moveToNext();
+List scriptApplies = new ArrayList<>(CasUtil.select(cas, 
scriptApplyType));
+// sort by creation time
+Collections.sort(scriptApplies, new Comparator() {
+
+  @Override
+  public int compare(AnnotationFS o1, AnnotationFS o2) {
+Feature

svn commit: r1848777 - /uima/ruta/trunk/ruta-core/

2018-12-12 Thread pkluegl 
Author: pkluegl
Date: Wed Dec 12 16:27:47 2018
New Revision: 1848777

URL: http://svn.apache.org/viewvc?rev=1848777=rev
Log:
svn:ignore

Modified:
uima/ruta/trunk/ruta-core/   (props changed)

Propchange: uima/ruta/trunk/ruta-core/
--
--- svn:ignore (original)
+++ svn:ignore Wed Dec 12 16:27:47 2018
@@ -3,3 +3,4 @@ target
 .project
 .settings
 api-change-report
+input

svn commit: r1848776 - in /uima/ruta/trunk: ./ example-projects/ruta-ep-example-extensions/ example-projects/ruta-maven-example/ ruta-basic-type/ ruta-core-ext/ ruta-core/ ruta-docbook/ ruta-eclipse-f

2018-12-12 Thread pkluegl 
Author: pkluegl
Date: Wed Dec 12 16:26:03 2018
New Revision: 1848776

URL: http://svn.apache.org/viewvc?rev=1848776=rev
Log:
UIMA-5671: set dev version, override api report parameter with local path

Added:
uima/ruta/trunk/ruta-parent/src/
uima/ruta/trunk/ruta-parent/src/main/
uima/ruta/trunk/ruta-parent/src/main/groovy/
uima/ruta/trunk/ruta-parent/src/main/groovy/api-report.groovy
Modified:
uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/ruta/trunk/example-projects/ruta-maven-example/pom.xml
uima/ruta/trunk/pom.xml
uima/ruta/trunk/ruta-basic-type/pom.xml
uima/ruta/trunk/ruta-core-ext/pom.xml
uima/ruta/trunk/ruta-core/pom.xml
uima/ruta/trunk/ruta-docbook/pom.xml
uima/ruta/trunk/ruta-eclipse-feature/pom.xml
uima/ruta/trunk/ruta-ep-addons/pom.xml
uima/ruta/trunk/ruta-ep-caseditor/pom.xml
uima/ruta/trunk/ruta-ep-core-ext/pom.xml
uima/ruta/trunk/ruta-ep-engine/pom.xml
uima/ruta/trunk/ruta-ep-ide-ui/pom.xml
uima/ruta/trunk/ruta-ep-ide/pom.xml
uima/ruta/trunk/ruta-ep-parent/pom.xml
uima/ruta/trunk/ruta-ep-textruler/pom.xml
uima/ruta/trunk/ruta-maven-archetype/pom.xml
uima/ruta/trunk/ruta-maven-plugin/pom.xml
uima/ruta/trunk/ruta-parent/pom.xml
uima/ruta/trunk/ruta-typesystem/pom.xml

Modified: uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml 
(original)
+++ uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml Wed Dec 
12 16:26:03 2018
@@ -25,7 +25,7 @@
   
 org.apache.uima
 ruta-ep-parent
-2.6.2-SNAPSHOT
+2.7.0-SNAPSHOT
 ../../ruta-ep-parent/pom.xml
   
   

Modified: uima/ruta/trunk/example-projects/ruta-maven-example/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ruta-maven-example/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/example-projects/ruta-maven-example/pom.xml (original)
+++ uima/ruta/trunk/example-projects/ruta-maven-example/pom.xml Wed Dec 12 
16:26:03 2018
@@ -15,7 +15,7 @@

org.apache.uima
ruta-parent
-   2.6.2-SNAPSHOT
+   2.7.0-SNAPSHOT
../../ruta-parent/pom.xml

${uimaWebsiteUrl}

Modified: uima/ruta/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/pom.xml (original)
+++ uima/ruta/trunk/pom.xml Wed Dec 12 16:26:03 2018
@@ -12,7 +12,7 @@
   
 org.apache.uima
 ruta-parent
-2.6.2-SNAPSHOT
+2.7.0-SNAPSHOT
 ruta-parent/pom.xml
   
 

Modified: uima/ruta/trunk/ruta-basic-type/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-basic-type/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/ruta-basic-type/pom.xml (original)
+++ uima/ruta/trunk/ruta-basic-type/pom.xml Wed Dec 12 16:26:03 2018
@@ -16,7 +16,7 @@
   
 org.apache.uima
 ruta-parent
-2.6.2-SNAPSHOT
+2.7.0-SNAPSHOT
 ../ruta-parent/pom.xml
   
   

Modified: uima/ruta/trunk/ruta-core-ext/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/ruta-core-ext/pom.xml (original)
+++ uima/ruta/trunk/ruta-core-ext/pom.xml Wed Dec 12 16:26:03 2018
@@ -21,7 +21,7 @@

org.apache.uima
ruta-parent
-   2.6.2-SNAPSHOT
+   2.7.0-SNAPSHOT
../ruta-parent/pom.xml



Modified: uima/ruta/trunk/ruta-core/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/ruta/trunk/ruta-core/pom.xml Wed Dec 12 16:26:03 2018
@@ -16,7 +16,7 @@
   
 org.apache.uima
 ruta-parent
-2.6.2-SNAPSHOT
+2.7.0-SNAPSHOT
 ../ruta-parent/pom.xml
   
   

Modified: uima/ruta/trunk/ruta-docbook/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/pom.xml?rev=1848776=1848775=1848776=diff
==
--- uima/ruta/trunk/ruta-docbook/pom.xml (original)
+++ uima/ruta/trunk/ruta-docbook/pom.xml Wed Dec 12 16:26:03 2018
@@ -24,7 +24,7 @@
   
 org.apache.uima
 ruta-parent
-2.6.2-SNAPSHOT

svn commit: r1848768 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/RutaEnvironment.java test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java

2018-12-12 Thread pkluegl 
Author: pkluegl
Date: Wed Dec 12 14:44:41 2018
New Revision: 1848768

URL: http://svn.apache.org/viewvc?rev=1848768=rev
Log:
UIMA-5888: fixed reset, added test

Modified:

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

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?rev=1848768=1848767=1848768=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
 Wed Dec 12 14:44:41 2018
@@ -993,8 +993,9 @@ public class RutaEnvironment {
Set> entrySet = variableValues.entrySet();
for (Entry entry : entrySet) {
String key = entry.getKey();
+   Class variableType = variableTypes.get(key);
Object initialValue = getInitialValue(key, 
variableTypes.get(key));
-   if (initialValue != null) {
+   if ((!variableType.equals(RutaTable.class) && 
!variableType.equals(RutaWordList.class) ) || initialValue != null) {
// not for word lists
entry.setValue(initialValue);
}

Modified: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java?rev=1848768=1848767=1848768=diff
==
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java
 Wed Dec 12 14:44:41 2018
@@ -22,21 +22,31 @@ package org.apache.uima.ruta.expression.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.fit.factory.AnalysisEngineFactory;
 import org.apache.uima.jcas.cas.FSArray;
+import org.apache.uima.resource.ResourceConfigurationException;
+import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
+import org.apache.uima.ruta.engine.RutaEngine;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class AnnotationVariableExpressionTest {
@@ -224,4 +234,44 @@ public class AnnotationVariableExpressio
 assertNotNull("Feature value is null!", array);
 assertEquals(2, array.size());
   }
+  
+  
+  @Test
+  public void testResetVariableBetweenCases() throws 
ResourceInitializationException, InvalidXMLException, IOException, 
AnalysisEngineProcessException, ResourceConfigurationException, 
URISyntaxException {
+
+   String document = "Some text.";
+String script = "ANNOTATIONLIST as;\n";
+script += "ANNOTATION a;\n";
+script += "WORDLIST wl = 
'org/apache/uima/ruta/WSDictionaryTestList.txt';\n";
+script += "WORDTABLE wt = 'org/apache/uima/ruta/table2.csv';\n";
+script += "a{-> T1};\n";
+script += "as{-> T2};\n";
+script += "Document{-> a = CW};\n";
+script += "Document{-> as = W};\n";
+script += "a{-> T3};\n";
+script += "as{-> T4};";
+
+AnalysisEngineDescription description = 
AnalysisEngineFactory.createEngineDescription(RutaEngine.class, 
RutaEngine.PARAM_RULES, script);
+AnalysisEngine engine = AnalysisEngineFactory.createEngine(description);
+
+CAS cas =  RutaTestUtils.getCAS(document);
+
+cas.reset();
+cas.setDocumentText(document);
+engine.process(cas);
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+

svn commit: r1848767 - /uima/site/trunk/uima-website/docs/board-reports/2018-12.txt

2018-12-12 Thread schor 
Author: schor
Date: Wed Dec 12 14:18:23 2018
New Revision: 1848767

URL: http://svn.apache.org/viewvc?rev=1848767=rev
Log:
no jira board report 12 2018

Modified:
uima/site/trunk/uima-website/docs/board-reports/2018-12.txt

Modified: uima/site/trunk/uima-website/docs/board-reports/2018-12.txt
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2018-12.txt?rev=1848767=1848766=1848767=diff
==
--- uima/site/trunk/uima-website/docs/board-reports/2018-12.txt (original)
+++ uima/site/trunk/uima-website/docs/board-reports/2018-12.txt Wed Dec 12 
14:18:23 2018
@@ -27,6 +27,10 @@ Activity:
   
   We upgraded our build release process to work with Java 11, as well as Java 
8.
   The Java SDK, uimaFIT, UIMA-AS, DUCC, RUTA are actively being worked on.
+  
+  The UIMA C++ version, after a long while of no volunteers to work on it,
+  has sprung to life, with one new contributor working to upgrade it to
+  current levels and get the test cases working again.
 
 Community: The community continues to be moderately active.