svn commit: r1876649 - in /uima/site/trunk/uima-website: docs/downloads.html docs/news.html docs/ruta.html xdocs/news.xml xdocs/ruta.xml xdocs/stylesheets/project.xml
Author: pkluegl Date: Fri Apr 17 07:53:13 2020 New Revision: 1876649 URL: http://svn.apache.org/viewvc?rev=1876649&view=rev Log: release ruta 3.0.1 Modified: uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/docs/ruta.html uima/site/trunk/uima-website/xdocs/news.xml uima/site/trunk/uima-website/xdocs/ruta.xml uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1876649&r1=1876648&r2=1876649&view=diff == --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Fri Apr 17 07:53:13 2020 @@ -889,27 +889,27 @@ Other mirrors: - - UIMA Ruta 3.0.0 + + UIMA Ruta 3.0.1 -html +html - zip - [asc] + zip + [asc] - [sha512] + [sha512] - 09-Dec-2019 + 17-Apr-2020 Modified: uima/site/trunk/uima-website/docs/news.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1876649&r1=1876648&r2=1876649&view=diff == --- uima/site/trunk/uima-website/docs/news.html (original) +++ uima/site/trunk/uima-website/docs/news.html Fri Apr 17 07:53:13 2020 @@ -232,6 +232,20 @@ + 17 April 2020 + + Apache UIMA Ruta 3.0.1 released + + + + + 11 April 2020 + + Apache UIMA Ruta 2.8.1 released + + + + 09 December 2019 Apache UIMA Ruta 3.0.0 released @@ -803,6 +817,100 @@ + + +17 Apr 2020 +– Apache UIMA Ruta 3.0.1 released + + + + + +Apache UIMA Ruta is a rule-based script language supported by +Eclipse-based tooling. The language is designed to enable rapid +development of text processing applications within UIMA. A special focus +lies on the intuitive and flexible domain specific language for defining +patterns of annotations. The Eclipse-based tooling, +called the Apache UIMA Ruta Workbench, supports the +user and facilitates every step when writing rules. Both +the rule language and the workbench integrate +smoothly with Apache UIMA. + +Major Changes in this Release + +This release provides compatibility to UIMA v3 with the functionality of the version 2.8.1. +An upgrade from UIMA Ruta v2 to this version +requires also an update to UIMA v3 of the overall application and/or Eclipse installation. +Please refer to the UIMA v3 user's guide for detailed information: +https://uima.apache.org/d/uimaj-3.1.1/version_3_users_guide.html + +Major Changes in this Release + +Fixed broken literal string matching. +Fixed variable initialization with other variables. +Fixed assignment of lists to variables. +Fixed assignment of annotation comparison expression to variables. +PARSE condition supports additional argument that represents the string to be parsed. + + + The UIMA Ruta Workbench and in particular the launching of UIMA Ruta +script in simple UIMA Ruta projects faces some incompatibilities with +newer Java versions. Please refer to the UIMA mailing lists for known +workarounds. + +For a complete list of bugs and improvements included in this release please see + https://uima.apache.org/d/ruta-3.0.1/issuesFixed/jira-report.html";>issue report. + + + + + + + + + + +11 Apr 2020 +
svn commit: r1876650 - /uima/site/trunk/uima-website/docs/d/ruta-3.0.0/ruta-3.0.0/
Author: pkluegl Date: Fri Apr 17 07:56:04 2020 New Revision: 1876650 URL: http://svn.apache.org/viewvc?rev=1876650&view=rev Log: copy old docs for next release Added: uima/site/trunk/uima-website/docs/d/ruta-3.0.0/ruta-3.0.0/ - copied from r1876649, uima/site/trunk/uima-website/docs/d/ruta-3.0.0/
svn commit: r1876651 - in /uima/site/trunk/uima-website/docs/d: ruta-3.0.0/ruta-3.0.0/ ruta-3.0.1/
Author: pkluegl Date: Fri Apr 17 07:56:34 2020 New Revision: 1876651 URL: http://svn.apache.org/viewvc?rev=1876651&view=rev Log: copy old docs for next release Added: uima/site/trunk/uima-website/docs/d/ruta-3.0.1/ - copied from r1876650, uima/site/trunk/uima-website/docs/d/ruta-3.0.0/ruta-3.0.0/ Removed: uima/site/trunk/uima-website/docs/d/ruta-3.0.0/ruta-3.0.0/
svn commit: r1876652 [1/2] - in /uima/site/trunk/uima-website/docs/d: ruta-3.0.1/ ruta-3.0.1/issuesFixed/ ruta-current/
Author: pkluegl
Date: Fri Apr 17 08:00:49 2020
New Revision: 1876652
URL: http://svn.apache.org/viewvc?rev=1876652&view=rev
Log:
release ruta 3.0.1
Modified:
uima/site/trunk/uima-website/docs/d/ruta-3.0.1/RELEASE_NOTES.html
uima/site/trunk/uima-website/docs/d/ruta-3.0.1/issuesFixed/jira-report.html
uima/site/trunk/uima-website/docs/d/ruta-3.0.1/tools.ruta.book.html
uima/site/trunk/uima-website/docs/d/ruta-3.0.1/tools.ruta.book.pdf
uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html
uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf
Modified: uima/site/trunk/uima-website/docs/d/ruta-3.0.1/RELEASE_NOTES.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-3.0.1/RELEASE_NOTES.html?rev=1876652&r1=1876651&r2=1876652&view=diff
==
--- uima/site/trunk/uima-website/docs/d/ruta-3.0.1/RELEASE_NOTES.html (original)
+++ uima/site/trunk/uima-website/docs/d/ruta-3.0.1/RELEASE_NOTES.html Fri Apr
17 08:00:49 2020
@@ -21,10 +21,10 @@
-->
- Apache UIMA Ruta v3.0.0 Release Notes
+ Apache UIMA Ruta v3.0.1 Release Notes
-Apache UIMA Ruta™ v3.0.0 Release Notes
+Apache UIMA Ruta™ v3.0.1 Release Notes
Contents
@@ -47,25 +47,20 @@
2. Major Changes in this Release
+
This release provides compatibility to UIMA v3. An upgrade from UIMA Ruta v2
to this version requires
also an update to UIMA v3 of the overall application or Eclipse
installation. Please refer to the
UIMA v3 user's guide for detailed information:
https://uima.apache.org/d/uimaj-3.0.0/version_3_users_guide.html
- This release contains changed in the analysis engine descriptor and the type
system descriptors
- and therefore requires an update of the Ruta projects. This can be
accomplished, for example, by
- right-clicking on the Ruta project, selecting "UIMA Ruta" and then "Update
Project".
-
-
UIMA Ruta Language and Analysis Engine:
-Depends on UIMA 3.1.1 and uimaFIT 3.0.0
-Provides compatibility to UIMA v3
-
- UIMA Ruta Workbench:
-
-Depends on UIMA v3 and provides compatibility to UIMA v3
+ Fixed broken literal string matching.
+ Fixed variable initialization with other variables.
+ Fixed assignment of lists to variables.
+ Fixed assignment of annotation comparison expression to
variables.
+PARSE condition supports additional argument that represents the
string to be parsed.
@@ -75,22 +70,21 @@
The Apache UIMA Ruta project really needs and appreciates any contributions,
including documentation help, source code and feedback. If you are interested
in contributing, please visit
-http://uima.apache.org/get-involved.html";>
- http://uima.apache.org/get-involved.html.
+https://uima.apache.org/get-involved.html";>
+ https://uima.apache.org/get-involved.html.
4. How to Report Issues
The Apache UIMA project uses JIRA for issue tracking. Please report any
issues you find at
-http://issues.apache.org/jira/browse/uima";>http://issues.apache.org/jira/browse/uima
+https://issues.apache.org/jira/browse/uima";>https://issues.apache.org/jira/browse/uima
5. List of JIRA Issues Fixed in this Release
Click issuesFixed/jira-report.html
for the list of
-issues fixed in this release. This list contains all issues that have been
fixed to prepare the synchronous releases
-of UIMA Ruta 2.8.0 and UIMA Ruta 3.0.0.
+issues fixed in this release.
\ No newline at end of file
Modified:
uima/site/trunk/uima-website/docs/d/ruta-3.0.1/issuesFixed/jira-report.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-3.0.1/issuesFixed/jira-report.html?rev=1876652&r1=1876651&r2=1876652&view=diff
==
--- uima/site/trunk/uima-website/docs/d/ruta-3.0.1/issuesFixed/jira-report.html
(original)
+++ uima/site/trunk/uima-website/docs/d/ruta-3.0.1/issuesFixed/jira-report.html
Fri Apr 17 08:00:49 2020
@@ -1,5 +1,5 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-
+
http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
@import url("./css/site.css");
-
+
@@ -24,7 +24,7 @@
-Last Published: 2019-11-26
+Last Published: 2020-03-26
| Version:
${project.version}
@@ -47,7 +47,7 @@
-JIRA ReportTypeKeyStatusSummaryBughttps://issues.apache.org/jira/browse/UIMA-4238";>UIMA-4238ResolvedRuta:
RuleElement.getRule() pointing to nowhereBughttps://issues.apache.org/jira/browse/UIMA-5431";>UIMA-5431ResolvedRuta
svn commit: r1876652 [2/2] - in /uima/site/trunk/uima-website/docs/d: ruta-3.0.1/ ruta-3.0.1/issuesFixed/ ruta-current/
Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html?rev=1876652&r1=1876651&r2=1876652&view=diff == --- uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html (original) +++ uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html Fri Apr 17 08:00:49 2020 @@ -2,7 +2,7 @@ Apache UIMA Ruta™ Guide and Referencehttp://docbook.org/ns/docbook"; class="titlepage">Apache UIMA Ruta™ Guide and Reference Written and maintained by the Apache UIMA Development Community -Version 3.0.0Copyright © 2011, 2019 The Apache Software Foundation +Version 3.0.1Copyright © 2011, 2020 The Apache Software Foundation License and Disclaimer. @@ -35,7 +35,7 @@ the trademark or service mark. -November, 2019Table of Contents1. Apache UIMA Ruta Overview1.1. What is Apache UIMA Ruta?1.2. Getting started1.3. Core Concepts1.4. Learning by Example1.5. UIMA Analysis Engines1.5.1. Ruta Engine1.5.2. Annotation Writer1.5.3. Plain Text Annotator1.5.4. Modifier1.5.5. HTML Annotator1.5.6. HTML Converter1.5.7. Style Map Creator1.5.8. Cutter1.5.9. View Writer1.5.10. XMI Writer2. Apache UIMA Ruta Language2.1. Syntax2.2. Rule elements and their matching order2.3. Basic annotations and tokens2.4. Quantifiers2.4.1. * Star Greedy2.4.2. *? Star Reluctant2.4.3. + Plus Greedy2.4.4. +? Plus Reluctant2.4.5. ? Question Greedy2.4.6. ?? Question Reluctant2.4.7. [x,y] Min Max Greedy2.4.8. [x,y]? Min Max Reluctant2.5. Declarations2.5.1. Types2.5.2. Variables2.5.3. Resources2.5.4. Scripts2.5.5. Componen ts2.6. Expressions2.6.1. Type Expressions2.6.2. Annotation Expressions2.6.3. Number Expressions2.6.4. String Expressions2.6.5. Boolean Expressions2.6.6. List Expressions2.6.7. Feature Expressions2.7. Conditions2.7.1. AFTER2.7.2. AND2.7.3. BEFORE2.7.4. CONTAINS2.7.5. CONTEXTCOUNT2.7.6. COUNT2.7.7. CURRENTCOUNT2.7.8. ENDSWITH2.7.9. FEATURE2.7.10. IF2.7.11. INLIST2.7.12. IS2.7.13. LAST2.7.14. MOFN2.7.15. NEAR2.7.16. NOT2.7.17. OR2.7.18. PARSE2.7.19. PARTOF2.7.20. PARTOFNEQ2.7.21. POSITION2.7.22. REGEXP2.7.23. SCORE2.7.24. SIZE2.7.25. STARTSWITH2.7.26. TOTALCOUNT2.7.27. VOTE2.8. Actions2.8.1. ADD2.8.2. ADDFILTERTYPE2.8.3. ADDRETAINTYPE2.8.4. ASSIGN2.8.5. CALL2.8.6. CLEAR2.8.7. COLOR2.8.8. CONFIGURE2.8.9. CREATE2.8.10. DEL2.8.11. DYNAMICANCHORING2.8.12. EXEC2.8.13. FILL2.8.14. FILTERTYPE2.8.15. GATHER2.8.16. GET2.8.17. GETFEATURE2.8.18. GETLIST2.8.19. GREEDYANCHORING2.8.20. LOG2.8.21. MARK2.8.22. MARKFAST2.8.23. MARKFIRST2.8.24. MARKLAST2.8.25. MARKONCE2.8.26. MARKSCORE2.8.27. MARKTABLE2.8.28. MATCHEDTEXT2.8.29. MERGE2.8.30. REMOVE2.8.31. REMOVEDUPLICATE2.8.32. REMOVEFILTERTYPE2.8.33. REMOVERETAINTYPE2.8.34. REPLACE2.8.35. RETAINTYPE2.8.36. SETFEATURE2.8.37. SHIFT2.8.38. SPLIT2.8.39. TRANSFER2.8.40. TRIE2.8.41. TRIM2.8.42. UNMARK2.8.43. UNMARKALL2.9. Robust extraction us ing filtering2.10. Wildcard #2.11. Optional match _2.12. Label expressions2.13. Blocks2.13.1. BLOCK2.13.2. FOREACH2.14. Inlined rules2.15. Macros for conditions and actions2.16. Heuristic extraction using s coring rules2.17. Modification2.18. External resources2.18.1. WORDLISTs2.18.2. WORDTABLEs2.19. Simple Rules based on Regular Expressions2.20. Language Extensions2.20.1. Provided Extensions2.20.2. Adding new Language Elements3. Apache UIMA Ruta Workbench3.1. Installation3.2. UIMA Ruta Workbench Overview3.3. UIMA Ruta Projects3.3.1. UIMA Ruta create project wizard3.4. UIMA Ruta Perspective3.4.1. Annotation Browser3.4.2. Selectio n3.5. UIMA Ruta Explain Perspective3.5.1. Applied Rules3.5.2. Matched Rules and Failed Rules3.5.3. Rule Elements3.5.4. Inlined Rules3.5.5. Covering Rules3.5.6. Rule List3.5.7. Created By3.5.8. Statistics3.6. UIMA Ruta CDE perspective3.6.1. CDE Documents view3.6.2. CDE Constraints view3.6.3. CDE Result view3.7. Ruta Query View3.8. Testing3.8.1. Usage3.8.2. Evaluators3.9. TextRuler3.9.1. Included rule learning algorithms3.9.2. The TextRuler view3.10. Check Annotations view3.11. Creation of Tree Word Lists3.12. Apply a UIMA Ruta script to a folderclass="chapter">4. Apache UIMA Ruta >HowToshref="#ugr.tools.ruta.ae.basic.apply">4.1. Apply UIMA Ruta Analysis Engine in >plain Javahref="#ugr.tools.ruta.integration">4.2. Integrating UIMA Ruta in an existing >UIMA Annotatorhref="#ugr.tools.ruta.ae.integration.mvn">4.2.1. Adding Ruta to our >Annotatorhref="#ugr.tools.ruta.ae.integration.loading">4.2.2. Developing Ruta rules >and applying them from inside Java code +March, 2020Table of Contents1. Apache UIMA Ruta Overview1.1. What is Apache UIMA Ruta?1.2. Getting started1.3. Core Concepts1.4. Learning b
svn commit: r39158 - in /release/uima: ruta-2.2.0/ ruta-2.2.1/ ruta-2.3.0/ ruta-2.3.1/ ruta-2.4.0/ ruta-2.5.0/ ruta-2.6.0/ ruta-2.6.1/ ruta-2.7.0/
Author: pkluegl Date: Tue Apr 28 07:45:45 2020 New Revision: 39158 Log: UIMA-6228: remove old source releases Removed: release/uima/ruta-2.2.0/ release/uima/ruta-2.2.1/ release/uima/ruta-2.3.0/ release/uima/ruta-2.3.1/ release/uima/ruta-2.4.0/ release/uima/ruta-2.5.0/ release/uima/ruta-2.6.0/ release/uima/ruta-2.6.1/ release/uima/ruta-2.7.0/
[uima-ruta] 01/01: [NO JIRA] add gitignore for plugin modules
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit ee194d098f100f018f76480d6486af4178e3878a Author: Peter Klügl AuthorDate: Mon May 18 10:46:11 2020 +0200 [NO JIRA] add gitignore for plugin modules --- .../ruta-ep-example-extensions/.gitignore | 1 + ruta-ep-addons/.gitignore | 1 + ruta-ep-addons/META-INF/MANIFEST.MF| 110 - ruta-ep-caseditor/.gitignore | 1 + ruta-ep-caseditor/META-INF/MANIFEST.MF | 40 ruta-ep-core-ext/.gitignore| 1 + ruta-ep-core-ext/META-INF/MANIFEST.MF | 34 --- ruta-ep-engine/.gitignore | 1 + ruta-ep-ide-ui/.gitignore | 1 + ruta-ep-ide/.gitignore | 1 + ruta-ep-textruler/.gitignore | 1 + 11 files changed, 8 insertions(+), 184 deletions(-) diff --git a/example-projects/ruta-ep-example-extensions/.gitignore b/example-projects/ruta-ep-example-extensions/.gitignore new file mode 100644 index 000..718773c --- /dev/null +++ b/example-projects/ruta-ep-example-extensions/.gitignore @@ -0,0 +1 @@ +META-INF/ diff --git a/ruta-ep-addons/.gitignore b/ruta-ep-addons/.gitignore new file mode 100644 index 000..718773c --- /dev/null +++ b/ruta-ep-addons/.gitignore @@ -0,0 +1 @@ +META-INF/ diff --git a/ruta-ep-addons/META-INF/MANIFEST.MF b/ruta-ep-addons/META-INF/MANIFEST.MF deleted file mode 100644 index 4bc6888..000 --- a/ruta-ep-addons/META-INF/MANIFEST.MF +++ /dev/null @@ -1,110 +0,0 @@ -Manifest-Version: 1.0 -Bnd-LastModified: 1589540103189 -Build-Date: 200515_1054 -Build-Jdk: 13.0.1 -Built-By: rec -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.apache.uima.ruta.addons.RutaAddonsPlugin -Bundle-Description: Provides addons for the UIMA Ruta Workbench in Eclip - se -Bundle-DocURL: https://www.apache.org/ -Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-ManifestVersion: 2 -Bundle-Name: Apache UIMA Ruta Eclipse: ruta-ep-addons -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-SymbolicName: org.apache.uima.ruta.addons;singleton:=true -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.8.2.SNAPSHOT -Created-By: Apache Maven Bundle Plugin -Export-Package: org.apache.uima.ruta;version="2.8.2",org.apache.uima.rut - a.action;version="2.8.2",org.apache.uima.ruta.addons;version="2.8.2",or - g.apache.uima.ruta.block;version="2.8.2",org.apache.uima.ruta.caseditor - ;version="2.8.2",org.apache.uima.ruta.caseditor.view.browser;version="2 - .8.2",org.apache.uima.ruta.caseditor.view.html;version="2.8.2",org.apac - he.uima.ruta.caseditor.view.preferences;version="2.8.2",org.apache.uima - .ruta.caseditor.view.selection;version="2.8.2",org.apache.uima.ruta.cas - editor.view.tree;version="2.8.2",org.apache.uima.ruta.cde;version="2.8. - 2",org.apache.uima.ruta.cde.ui;version="2.8.2",org.apache.uima.ruta.cde - .utils;version="2.8.2",org.apache.uima.ruta.check;version="2.8.2",org.a - pache.uima.ruta.condition;version="2.8.2",org.apache.uima.ruta.constrai - nt;version="2.8.2",org.apache.uima.ruta.descriptor;version="2.8.2",org. - apache.uima.ruta.engine;version="2.8.2",org.apache.uima.ruta.explain;ve - rsion="2.8.2",org.apache.uima.ruta.explain.apply;version="2.8.2",org.ap - ache.uima.ruta.explain.createdBy;version="2.8.2",org.apache.uima.ruta.e - xplain.element;version="2.8.2",org.apache.uima.ruta.explain.failed;vers - ion="2.8.2",org.apache.uima.ruta.explain.inlined;version="2.8.2",org.ap - ache.uima.ruta.explain.matched;version="2.8.2",org.apache.uima.ruta.exp - lain.rulelist;version="2.8.2",org.apache.uima.ruta.explain.selection;ve - rsion="2.8.2",org.apache.uima.ruta.explain.tree;version="2.8.2",org.apa - che.uima.ruta.expression;version="2.8.2",org.apache.uima.ruta.expressio - n.annotation;version="2.8.2",org.apache.uima.ruta.expression.bool;versi - on="2.8.2",org.apache.uima.ruta.expression.feature;version="2.8.2",org. - apache.uima.ruta.expression.list;version="2.8.2",org.apache.uima.ruta.e - xpression.number;version="2.8.2",org.apache.uima.ruta.expression.resour - ce;version="2.8.2",org.apache.uima.ruta.expression.string;version="2.8. - 2",org.apache.uima.ruta.expression.type;version="2.8.2",org.apache.uima - .ruta.extensions;version="2.8.2",org.apache.uima.ruta.ide;version="2.8. - 2",org.apache.uima.ruta.ide.core;version="2.8.
[uima-ruta] annotated tag ruta-2.0.1 updated (98067ca -> 58dfa1b)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to annotated tag ruta-2.0.1 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. *** WARNING: tag ruta-2.0.1 was modified! *** from 98067ca (commit) to 58dfa1b (tag) tagging 98067ca485445e4e4385e92ac746405344e3a63f (commit) by Peter Klügl on Tue Nov 26 09:47:56 2013 + - Log - ruta-2.0.1 --- No new revisions were added by this update. Summary of changes:
[uima-ruta] branch NO-JIRA-exclude-metainf created (now ee194d0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at ee194d0 [NO JIRA] add gitignore for plugin modules This branch includes the following new commits: new ee194d0 [NO JIRA] add gitignore for plugin modules The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch NO-JIRA-extend-readme created (now 1fc8744)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch NO-JIRA-extend-readme in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website This branch includes the following new commits: new 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: [NO JIRA] extending reamde with more information, mostly from the ruta website
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch NO-JIRA-extend-readme
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 1fc874457f34e8a2e042d7386f93920c8349
Author: Peter Klügl
AuthorDate: Mon May 18 16:07:13 2020 +0200
[NO JIRA] extending reamde with more information, mostly from the ruta
website
---
README.md | 90 +++
1 file changed, 90 insertions(+)
diff --git a/README.md b/README.md
index 6086ca5..47a33a9 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,96 @@ What is Apache UIMA Ruta?
Apache UIMA Ruta™ is a rule-based script language supported by Eclipse-based
tooling. The language is designed to enable rapid development of text
processing applications within Apache UIMA™. A special focus lies on the
intuitive and flexible domain specific language for defining patterns of
annotations. Writing rules for information extraction or other text processing
applications is a tedious process. The Eclipse-based tooling for UIMA Ruta,
called the Apache UIMA Ruta Workbench, was c [...]
+
+Rule Language
+-
+
+The UIMA Ruta language is an imperative rule language extended with scripting
elements. A rule defines a
+pattern of annotations with additional conditions. If this pattern applies,
then the actions of the rule are performed
+on the matched annotations. A rule is composed of a sequence of rule elements
and a rule element usually consists of four parts:
+A matching condition, an optional quantifier, a list of conditions and a list
of actions.
+The matching condition is typically a type of an annotation by which the rule
element matches on the covered text of one of those annotations.
+The quantifier specifies, whether it is necessary that the rule element
successfully matches and how often the rule element may match.
+The list of conditions specifies additional constraints that the matched text
or annotations need to fulfill. The list of actions defines
+the consequences of the rule and often creates new annotations or modifies
existing annotations.
+
+
+The following example rule consists of three rule elements. The first one
(`ANY...`) matches on every token, which has a covered text that occurs in a
word lists, named `MonthsList`.
+The second rule element (`PERIOD?`) is optional and does not need to be
fulfilled, which is indicated by the quantifier `?`. The last rule element
(`NUM...`) matches
+on numbers that fulfill the regular expression `REGEXP(".{2,4}")` and are
therefore at least two characters to a maximum of four characters long.
+If this rule successfully matches on a text passage, then its three actions
are executed: An annotation of the type `Month` is created for the first rule
element,
+an annotation of the type `Year` is created for the last rule element and an
annotation of the type `Date`
+is created for the span of all three rule elements. If the word list contains
the correct entries, then this rule matches on strings like
+`Dec. 2004`, `July 85` or `11.2008` and creates the corresponding annotations.
+
+
+(ANY{INLIST(MonthsList) -> Month} PERIOD? @NUM{REGEXP(".{2,4}") -> Year}){->
Date};
+
+
+Here is a short overview of additional features of the rule language:
+
+* Expressions and variables
+* Import and execution of external components
+* Flexible matching with filtering
+* Modularization in different files or blocks
+* Control structures, e.g., for windowing
+* Score-based extraction
+* Modification
+* Html support
+* Dictionaries
+* Extensible language definition
+
+
+Workbench
+-
+
+The UIMA Ruta Workbench was created to facilitate all steps in creating
Analysis Engines based on the UIMA Ruta language.
+Here is a short overview of included features:
+
+**Editing support:** The full-featured editor for the UIMA Ruta language
provides syntax and semantic highlighting,
+syntax checking, context-sensitive auto-completion, template-based completion,
open declaration and more.
+
+**Rule Explanation:** Each step in the matching process can be explained: This
includes how often a rule was applied,
+which condition was not fulfilled, or by which rule a specific annotation was
created. Additionally, profile information
+about the runtime performance can be accessed.
+
+**Automatic Validation:** UIMA Ruta scripts can automatically validated
against a set of annotated documents (F1 score, test-driven development)
+and even against unlabeled documents (constraint-driven evaluation).
+
+**Rule learning:** The supervised learning algorithms of the included
TextRuler framework are able to induce rules
+and, therefore, enable semi-automatic development of rule-based components.
+
+**Query:** Rules can be used as query statements in order to investigate
annotated documents.
+
+
+The UIMA Ruta Workbench can be installed via Eclipse update
[uima-ruta] 01/01: Merge pull request #5 from apache/NO-JIRA-extend-readme
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 35caf3bd5b052ddc7fa084b50512aa63e6baded7 Merge: 5c11481 1fc8744 Author: pkluegl AuthorDate: Mon May 18 16:23:15 2020 +0200 Merge pull request #5 from apache/NO-JIRA-extend-readme [NO JIRA] extending reamde with more information, mostly from the ruta website README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] branch master-v2 updated (5c11481 -> 35caf3b)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 5c11481 Merge pull request #1 from apache/UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git add 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website new 35caf3b Merge pull request #5 from apache/NO-JIRA-extend-readme The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] branch NO-JIRA-extend-readme updated (1fc8744 -> b297bd0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch NO-JIRA-extend-readme in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 from apache/UIMA-6233-Failing-
[uima-ruta] 01/01: Merge branch 'master' into NO-JIRA-extend-readme
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch NO-JIRA-extend-readme in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit b297bd007afbda5c932f0bc41c4a50dfb1478391 Merge: 1fc8744 0b67cab Author: Peter Klügl AuthorDate: Mon May 18 16:24:26 2020 +0200 Merge branch 'master' into NO-JIRA-extend-readme README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 1 + .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 75 --- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/META-INF/MANIFEST.MF| 109 +++--- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 1 + ruta-ep-caseditor/META-INF/MANIFEST.MF | 34 +-- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/META-INF/MANIFEST.MF | 10 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 1 + ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 1 + ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 1 + ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 1 + ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 53 files changed, 620 insertions(+), 650 deletions(-)
[uima-ruta] 01/01: Merge pull request #6 from apache/NO-JIRA-extend-readme
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 992b67a98d2fabcfffcc77d4697c0fbf2b0f0a86 Merge: 0b67cab b297bd0 Author: pkluegl AuthorDate: Mon May 18 16:27:29 2020 +0200 Merge pull request #6 from apache/NO-JIRA-extend-readme [NO JIRA] extending readme with more information, mostly from the ruta website README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] branch master updated (0b67cab -> 992b67a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 0b67cab Merge pull request #4 from apache/UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git add 0a8b33c Merge pull request #2 from apache/UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 5c11481 Merge pull request #1 from apache/UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git add 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website add b297bd0 Merge branch 'master' into NO-JIRA-extend-readme new 992b67a Merge pull request #6 from apache/NO-JIRA-extend-readme The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] branch NO-JIRA-exclude-metainf updated (ee194d0 -> c209eb2)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ee194d0 [NO JIRA] add gitignore for plugin modules add 1fc8744 [NO JIRA] extending reamde with more information, mostly from the ruta website add 35caf3b Merge pull request #5 from apache/NO-JIRA-extend-readme new c209eb2 Merge branch 'master-v2' into NO-JIRA-exclude-metainf The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] 01/01: Merge branch 'master-v2' into NO-JIRA-exclude-metainf
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit c209eb2ed8fd435e9475b55a3780c3d7e40716bf Merge: ee194d0 35caf3b Author: Peter Klügl AuthorDate: Mon May 18 16:31:53 2020 +0200 Merge branch 'master-v2' into NO-JIRA-exclude-metainf README.md | 90 +++ 1 file changed, 90 insertions(+)
[uima-ruta] 01/01: Merge pull request #7 from apache/NO-JIRA-exclude-metainf
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 7cdb8998e331c4a82124351265f91fcd79a600aa Merge: 35caf3b c209eb2 Author: pkluegl AuthorDate: Mon May 18 16:34:14 2020 +0200 Merge pull request #7 from apache/NO-JIRA-exclude-metainf [NO JIRA] exclude metainf .../ruta-ep-example-extensions/.gitignore | 1 + ruta-ep-addons/.gitignore | 1 + ruta-ep-addons/META-INF/MANIFEST.MF| 110 - ruta-ep-caseditor/.gitignore | 1 + ruta-ep-caseditor/META-INF/MANIFEST.MF | 40 ruta-ep-core-ext/.gitignore| 1 + ruta-ep-core-ext/META-INF/MANIFEST.MF | 34 --- ruta-ep-engine/.gitignore | 1 + ruta-ep-ide-ui/.gitignore | 1 + ruta-ep-ide/.gitignore | 1 + ruta-ep-textruler/.gitignore | 1 + 11 files changed, 8 insertions(+), 184 deletions(-)
[uima-ruta] branch master-v2 updated (35caf3b -> 7cdb899)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 35caf3b Merge pull request #5 from apache/NO-JIRA-extend-readme add ee194d0 [NO JIRA] add gitignore for plugin modules add c209eb2 Merge branch 'master-v2' into NO-JIRA-exclude-metainf new 7cdb899 Merge pull request #7 from apache/NO-JIRA-exclude-metainf The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../ruta-ep-example-extensions/.gitignore | 1 + ruta-ep-addons/.gitignore | 1 + ruta-ep-addons/META-INF/MANIFEST.MF| 110 - ruta-ep-caseditor/.gitignore | 1 + ruta-ep-caseditor/META-INF/MANIFEST.MF | 40 ruta-ep-core-ext/.gitignore| 1 + ruta-ep-core-ext/META-INF/MANIFEST.MF | 34 --- ruta-ep-engine/.gitignore | 1 + ruta-ep-ide-ui/.gitignore | 1 + ruta-ep-ide/.gitignore | 1 + ruta-ep-textruler/.gitignore | 1 + 11 files changed, 8 insertions(+), 184 deletions(-) create mode 100644 example-projects/ruta-ep-example-extensions/.gitignore create mode 100644 ruta-ep-addons/.gitignore delete mode 100644 ruta-ep-addons/META-INF/MANIFEST.MF create mode 100644 ruta-ep-caseditor/.gitignore delete mode 100644 ruta-ep-caseditor/META-INF/MANIFEST.MF create mode 100644 ruta-ep-core-ext/.gitignore delete mode 100644 ruta-ep-core-ext/META-INF/MANIFEST.MF create mode 100644 ruta-ep-engine/.gitignore create mode 100644 ruta-ep-ide-ui/.gitignore create mode 100644 ruta-ep-ide/.gitignore create mode 100644 ruta-ep-textruler/.gitignore
[uima-ruta] branch NO-JIRA-exclude-metainf updated (c209eb2 -> 894ab69)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from c209eb2 Merge branch 'master-v2' into NO-JIRA-exclude-metainf add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 from apache/UIMA-6233-Failing-unit-tes
[uima-ruta] 01/01: Merge branch 'master' into NO-JIRA-exclude-metainf
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 894ab69bb1a6ab52735e1d38133fab61103198f5 Merge: c209eb2 992b67a Author: Peter Klügl AuthorDate: Mon May 18 16:37:53 2020 +0200 Merge branch 'master' into NO-JIRA-exclude-metainf # Conflicts: # example-projects/ruta-ep-example-extensions/.gitignore # ruta-ep-addons/META-INF/MANIFEST.MF # ruta-ep-caseditor/.gitignore # ruta-ep-caseditor/META-INF/MANIFEST.MF # ruta-ep-core-ext/META-INF/MANIFEST.MF # ruta-ep-engine/.gitignore # ruta-ep-ide-ui/.gitignore # ruta-ep-ide/.gitignore # ruta-ep-textruler/.gitignore README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 75 --- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 50 files changed, 565 insertions(+), 558 deletions(-)
[uima-ruta] 01/01: Merge pull request #8 from apache/NO-JIRA-exclude-metainf
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit fbdaab64789d3cf9fcdd573ffc0353ec582dba96 Merge: 992b67a 894ab69 Author: pkluegl AuthorDate: Mon May 18 16:40:49 2020 +0200 Merge pull request #8 from apache/NO-JIRA-exclude-metainf [NO JIRA] exclude metainf ruta-ep-addons/.gitignore | 1 + ruta-ep-addons/META-INF/MANIFEST.MF| 59 -- ruta-ep-caseditor/META-INF/MANIFEST.MF | 48 --- ruta-ep-core-ext/.gitignore| 1 + ruta-ep-core-ext/META-INF/MANIFEST.MF | 34 5 files changed, 2 insertions(+), 141 deletions(-)
[uima-ruta] branch master updated (992b67a -> fbdaab6)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 992b67a Merge pull request #6 from apache/NO-JIRA-extend-readme add ee194d0 [NO JIRA] add gitignore for plugin modules add 35caf3b Merge pull request #5 from apache/NO-JIRA-extend-readme add c209eb2 Merge branch 'master-v2' into NO-JIRA-exclude-metainf add 894ab69 Merge branch 'master' into NO-JIRA-exclude-metainf new fbdaab6 Merge pull request #8 from apache/NO-JIRA-exclude-metainf The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ruta-ep-addons/.gitignore | 1 + ruta-ep-addons/META-INF/MANIFEST.MF| 59 -- ruta-ep-caseditor/META-INF/MANIFEST.MF | 48 --- ruta-ep-core-ext/.gitignore| 1 + ruta-ep-core-ext/META-INF/MANIFEST.MF | 34 5 files changed, 2 insertions(+), 141 deletions(-) create mode 100644 ruta-ep-addons/.gitignore delete mode 100644 ruta-ep-addons/META-INF/MANIFEST.MF delete mode 100644 ruta-ep-caseditor/META-INF/MANIFEST.MF create mode 100644 ruta-ep-core-ext/.gitignore delete mode 100644 ruta-ep-core-ext/META-INF/MANIFEST.MF
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta created (now a5f32e0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern objects in REGEXP and RegExpRule No new revisions were added by this update.
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta created (now a5f32e0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern objects in REGEXP and RegExpRule No new revisions were added by this update.
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta created (now a5f32e0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern objects in REGEXP and RegExpRule No new revisions were added by this update.
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta created (now a5f32e0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern objects in REGEXP and RegExpRule No new revisions were added by this update.
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta created (now a5f32e0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern objects in REGEXP and RegExpRule No new revisions were added by this update.
[uima-ruta] branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta updated (a5f32e0 -> e1a5774)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch
UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from a5f32e0 [UIMA-6231] introducing new static cache for reusing Pattern
objects in REGEXP and RegExpRule
add e1a5774 [UIMA-6231] introducing new static cache for reusing Pattern
objects in REGEXP and RegExpRule - reimplementation - moved to new package -
fixed logic in test -> cleanup
No new revisions were added by this update.
Summary of changes:
ruta-core/pom.xml | 8 ++-
.../org/apache/uima/ruta/RutaPatternCache.java | 61 -
.../apache/uima/ruta/cache/PatternCacheKey.java| 70
.../apache/uima/ruta/cache/RutaPatternCache.java | 76 ++
.../uima/ruta/condition/RegExpCondition.java | 2 +-
.../java/org/apache/uima/ruta/rule/RegExpRule.java | 2 +-
.../ruta/{ => cache}/RutaPatternCacheTest.java | 16 +++--
ruta-ep-engine/pom.xml | 8 +++
8 files changed, 173 insertions(+), 70 deletions(-)
delete mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/RutaPatternCache.java
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/cache/PatternCacheKey.java
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/cache/RutaPatternCache.java
rename ruta-core/src/test/java/org/apache/uima/ruta/{ =>
cache}/RutaPatternCacheTest.java (88%)
[uima-ruta] 01/01: UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 567b1f40f708700aea475b1215904abbc2032a10
Author: Peter Klügl
AuthorDate: Mon Aug 17 15:21:50 2020 +0200
UIMA-6258: Action FILL only considers first annotation of given type
- touch all annotations in list
- added test
---
.../org/apache/uima/ruta/action/FillAction.java| 5 +--
.../java/org/apache/uima/ruta/action/FillTest.java | 40 --
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
b/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
index ff6d32f..9a1eb27 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
@@ -76,8 +76,9 @@ public class FillAction extends AbstractStructureAction {
}
}
}
- if (!list.isEmpty()) {
-AnnotationFS annotationFS = list.get(0);
+
+ for (AnnotationFS annotationFS : list) {
+
stream.getCas().removeFsFromIndexes(annotationFS);
context.setAnnotation(matchedAnnotation);
stream.assignFeatureValues(annotationFS, features, context);
diff --git a/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
index a28d778..0be768a 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
@@ -21,6 +21,8 @@ package org.apache.uima.ruta.action;
import static org.junit.Assert.assertEquals;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -30,27 +32,23 @@ 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.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.junit.Test;
public class FillTest {
@Test
- public void test() {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace =
this.getClass().getPackage().getName().replaceAll("\\.", "/");
Map complexTypes = new TreeMap();
String type = "org.apache.uima.LanguageStorage";
complexTypes.put(type, CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
-CAS cas = null;
-try {
- cas = RutaTestUtils.process(namespace + "/" + name +
RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50, false, false, complexTypes, null);
-} catch (Exception e) {
- e.printStackTrace();
- assert (false);
-}
+CAS cas = RutaTestUtils.process(namespace + "/" + name +
RutaEngine.SCRIPT_FILE_EXTENSION,
+namespace + "/" + name + ".txt", 50, false, false, complexTypes,
null);
Type t = null;
AnnotationIndex ai = null;
FSIterator iterator = null;
@@ -63,7 +61,27 @@ public class FillTest {
Feature featureByBaseName = t.getFeatureByBaseName("language");
String stringValue = afs.getStringValue(featureByBaseName);
assertEquals("en", stringValue);
-
-cas.release();
+ }
+
+ @Test
+ public void testOverlapping() throws Exception {
+
+String script = "(CW W){-> Struct, Struct};\n";
+script += "CW{-> FILL(Struct, \"s\" = \"a\")};\n";
+script += "Struct.s==\"a\"{-> T1};\n";
+
+Map typeMap = new TreeMap();
+String typeName = "Struct";
+typeMap.put(typeName, "uima.tcas.Annotation");
+
+Map> featureMap = new TreeMap>();
+List list = new ArrayList();
+featureMap.put(typeName, list);
+list.add(new TestFeature("s", "", "uima.cas.String"));
+
+CAS cas = RutaTestUtils.getCAS("Some text.", typeMap, featureMap);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "Some text");
}
}
[uima-ruta] branch UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type created (now 567b1f4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 567b1f4 UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test This branch includes the following new commits: new 567b1f4 UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch UIMA-6261-verbalization-NullExpression created (now 265069d)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6261-verbalization-NullExpression in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 265069d UIMA-6261: fixed verbalization of NullExpression and added test No new revisions were added by this update.
[uima-ruta] 01/01: UIMA-6256: started with test WIP
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6256-SPLIT-creates-invalid-annotations
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit e92fc0a78509d40481c653138672659148481380
Author: Peter Klügl
AuthorDate: Mon Aug 17 17:23:32 2020 +0200
UIMA-6256: started with test WIP
---
.../org/apache/uima/ruta/action/SplitTest.java | 80 +++---
1 file changed, 26 insertions(+), 54 deletions(-)
diff --git a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
index 2320776..cfd4567 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
@@ -37,12 +37,13 @@ import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.junit.Ignore;
import org.junit.Test;
public class SplitTest {
@Test
- public void testDefault() {
+ public void testDefault() throws Exception {
String document = "Some text. More text , with 1 , and more. even more
text.";
String script = "PERIOD #{-> T1} PERIOD;";
script += " #{-> T1} PERIOD;";
@@ -59,13 +60,8 @@ public class SplitTest {
String fn = "number";
list.add(new TestFeature(fn, "", "uima.tcas.Annotation"));
-CAS cas = null;
-try {
- cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
- Ruta.apply(cas, script);
-} catch (Exception e) {
- e.printStackTrace();
-}
+CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+Ruta.apply(cas, script);
Type t = null;
AnnotationIndex ai = null;
@@ -95,14 +91,10 @@ public class SplitTest {
assertNotNull(featureValue);
assertEquals("1", ((AnnotationFS) featureValue).getCoveredText());
-if (cas != null) {
- cas.release();
-}
-
}
@Test
- public void testAddBegin() {
+ public void testAddBegin() throws Exception {
String document = "Some text. More text , with 1 , and more. even more
text.";
String script = "PERIOD #{-> T1} PERIOD;";
script += " #{-> T1} PERIOD;";
@@ -119,13 +111,8 @@ public class SplitTest {
String fn = "number";
list.add(new TestFeature(fn, "", "uima.tcas.Annotation"));
-CAS cas = null;
-try {
- cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
- Ruta.apply(cas, script);
-} catch (Exception e) {
- e.printStackTrace();
-}
+CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+Ruta.apply(cas, script);
Type t = null;
AnnotationIndex ai = null;
@@ -155,14 +142,10 @@ public class SplitTest {
assertNotNull(featureValue);
assertEquals("1", ((AnnotationFS) featureValue).getCoveredText());
-if (cas != null) {
- cas.release();
-}
-
}
@Test
- public void testAddEnd() {
+ public void testAddEnd() throws Exception {
String document = "Some text. More text , with 1 , and more. even more
text.";
String script = "PERIOD #{-> T1} PERIOD;";
script += " #{-> T1} PERIOD;";
@@ -179,13 +162,8 @@ public class SplitTest {
String fn = "number";
list.add(new TestFeature(fn, "", "uima.tcas.Annotation"));
-CAS cas = null;
-try {
- cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
- Ruta.apply(cas, script);
-} catch (Exception e) {
- e.printStackTrace();
-}
+CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+Ruta.apply(cas, script);
Type t = null;
AnnotationIndex ai = null;
@@ -215,10 +193,6 @@ public class SplitTest {
assertNotNull(featureValue);
assertEquals("1", ((AnnotationFS) featureValue).getCoveredText());
-if (cas != null) {
- cas.release();
-}
-
}
@Test
@@ -270,14 +244,10 @@ public class SplitTest {
assertNotNull(featureValue);
assertEquals("1", ((AnnotationFS) featureValue).getCoveredText());
-if (cas != null) {
- cas.release();
-}
-
}
@Test
- public void testBoundarySplit() {
+ public void testBoundarySplit() throws Exception {
String document = "Some text. More text , with 1 , and more. even more
text.";
String script = "PERIOD #{-> T1} PERIOD;";
script += "#{-> T1} PERIOD;";
@@ -296,13 +266,8 @@ public class SplitTest {
String fn = "number";
list.add(new TestFeature(fn, "", "uima.tcas.Annotation"));
-CAS cas = null;
-try {
- cas = RutaTestUtils.
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations created (now e92fc0a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6256-SPLIT-creates-invalid-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at e92fc0a UIMA-6256: started with test WIP This branch includes the following new commits: new e92fc0a UIMA-6256: started with test WIP The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations updated: UIMA-6256: started with test WIP
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6256-SPLIT-creates-invalid-annotations
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/UIMA-6256-SPLIT-creates-invalid-annotations by this push:
new d553c37 UIMA-6256: started with test WIP
d553c37 is described below
commit d553c3766d573c1635cf1a90e4402dee49f21f7a
Author: Peter Klügl
AuthorDate: Mon Aug 17 17:30:30 2020 +0200
UIMA-6256: started with test WIP
---
.../src/test/java/org/apache/uima/ruta/action/SplitTest.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
index cfd4567..22fac40 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
@@ -332,14 +332,17 @@ public class SplitTest {
@Test
@Ignore
public void testMultiSplit() throws Exception {
-String document = "TODO";
+String document = "CAP-";
String script = "Document{-> T1};";
-script += "W.ct==\"no\"{-> T2};";
+script += "(SPECIAL SPECIAL){-> T2};";
script += "T1{-> SPLIT(T2, true, false, false)};";
-script += "T1{-> TRIM(COMMA)};";
CAS cas = RutaTestUtils.getCAS(document);
Ruta.apply(cas, script);
-//RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "c");
+//Collection select = CasUtil.select(cas,
RutaTestUtils.getTestType(cas, 1));
+//for (AnnotationFS annotationFS : select) {
+// System.out.println(annotationFS.getCoveredText());
+//}
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "CAP");
}
}
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations updated: UIMA-6256: fixed SPLIT logic
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6256-SPLIT-creates-invalid-annotations
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/UIMA-6256-SPLIT-creates-invalid-annotations by this push:
new 6a82b11 UIMA-6256: fixed SPLIT logic
6a82b11 is described below
commit 6a82b119337e4dc51998474c3a17cf7de03411d4
Author: Peter Klügl
AuthorDate: Mon Aug 17 17:49:45 2020 +0200
UIMA-6256: fixed SPLIT logic
---
.../org/apache/uima/ruta/action/SplitAction.java | 30 +++---
.../org/apache/uima/ruta/action/SplitTest.java | 6 -
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/action/SplitAction.java
b/ruta-core/src/main/java/org/apache/uima/ruta/action/SplitAction.java
index 41aa3ed..e8faa34 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/SplitAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/SplitAction.java
@@ -108,25 +108,25 @@ public class SplitAction extends AbstractRutaAction {
cas.removeFsFromIndexes(annotation);
int overallEnd = annotation.getEnd();
-Annotation first = annotation;
+Annotation current = annotation;
for (AnnotationFS each : annotationsInWindow) {
- int firstEnd = addToEnd ? each.getEnd() : each.getBegin();
- first.setEnd(firstEnd);
- boolean valid = trimInvisible(first, stream);
+ int currentEnd = addToEnd ? each.getEnd() : each.getBegin();
+ current.setEnd(currentEnd);
+ boolean valid = trimInvisible(current, stream);
if (valid) {
-stream.addAnnotation(first, true, true, match);
+stream.addAnnotation(current, true, true, match);
}
- Annotation second = (Annotation) cc.copyFs(first);
- int secondBegin = addToBegin ? each.getBegin() : each.getEnd();
- second.setBegin(secondBegin);
- second.setEnd(overallEnd);
- valid = trimInvisible(second, stream);
- if (valid) {
-stream.addAnnotation(second, true, true, match);
- }
- first = second;
+ Annotation next = (Annotation) cc.copyFs(current);
+ int nextBegin = addToBegin ? each.getBegin() : each.getEnd();
+ next.setBegin(nextBegin);
+ next.setEnd(overallEnd);
+
+ current = next;
+}
+if (trimInvisible(current, stream)) {
+ stream.addAnnotation(current, true, true, match);
}
}
@@ -171,7 +171,6 @@ public class SplitAction extends AbstractRutaAction {
}
private boolean trimInvisible(Annotation annotation, RutaStream stream) {
-List basics = new
ArrayList<>(stream.getAllBasicsInWindow(annotation));
int min = annotation.getEnd();
int max = annotation.getBegin();
@@ -179,6 +178,7 @@ public class SplitAction extends AbstractRutaAction {
if (min <= max) {
return false;
}
+List basics = new
ArrayList<>(stream.getAllBasicsInWindow(annotation));
for (RutaBasic each : basics) {
if (stream.isVisible(each)) {
diff --git a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
index 22fac40..3173f56 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/SplitTest.java
@@ -37,7 +37,6 @@ import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.junit.Ignore;
import org.junit.Test;
public class SplitTest {
@@ -330,7 +329,6 @@ public class SplitTest {
}
@Test
- @Ignore
public void testMultiSplit() throws Exception {
String document = "CAP-";
String script = "Document{-> T1};";
@@ -339,10 +337,6 @@ public class SplitTest {
CAS cas = RutaTestUtils.getCAS(document);
Ruta.apply(cas, script);
-//Collection select = CasUtil.select(cas,
RutaTestUtils.getTestType(cas, 1));
-//for (AnnotationFS annotationFS : select) {
-// System.out.println(annotationFS.getCoveredText());
-//}
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "CAP");
}
}
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations updated (6a82b11 -> fc0d34f)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6256-SPLIT-creates-invalid-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 6a82b11 UIMA-6256: fixed SPLIT logic add fc0d34f UIMA-6256: fixed SPLIT verbalization for explanation No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/action/SplitAction.java | 24 +-- .../uima/ruta/verbalize/ActionVerbalizer.java | 50 +- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 24 ++- 3 files changed, 62 insertions(+), 36 deletions(-)
[uima-ruta] 01/01: Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit edfa6451706afec61679a5e57560960001552507 Merge: e8efdb6 567b1f4 Author: pkluegl AuthorDate: Tue Aug 25 15:02:10 2020 +0200 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type UIMA-6258: Action FILL only considers first annotation of given type .../org/apache/uima/ruta/action/FillAction.java| 5 +-- .../java/org/apache/uima/ruta/action/FillTest.java | 40 -- 2 files changed, 32 insertions(+), 13 deletions(-)
[uima-ruta] branch master-v2 updated (e8efdb6 -> edfa645)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from e8efdb6 Merge pull request #11 from apache/UIMA-6260-Jenkinsfile-for-Ruta add 567b1f4 UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test new edfa645 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/action/FillAction.java| 5 +-- .../java/org/apache/uima/ruta/action/FillTest.java | 40 -- 2 files changed, 32 insertions(+), 13 deletions(-)
[uima-ruta] branch master updated (e40d0ff -> 2cca4b4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from e40d0ff Merge pull request #12 from apache/UIMA-6260-Jenkinsfile-for-Ruta add e8efdb6 Merge pull request #11 from apache/UIMA-6260-Jenkinsfile-for-Ruta add 567b1f4 UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test new 2cca4b4 Merge branch 'UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/action/FillAction.java| 5 +-- .../java/org/apache/uima/ruta/action/FillTest.java | 40 -- 2 files changed, 32 insertions(+), 13 deletions(-)
[uima-ruta] 01/01: Merge branch 'UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type'
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 2cca4b4c5dc517f23559b16e4e5c93f91d766f30 Merge: e40d0ff 567b1f4 Author: Peter Klügl AuthorDate: Tue Aug 25 15:03:23 2020 +0200 Merge branch 'UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type' .../org/apache/uima/ruta/action/FillAction.java| 5 +-- .../java/org/apache/uima/ruta/action/FillTest.java | 40 -- 2 files changed, 32 insertions(+), 13 deletions(-)
[uima-ruta] branch UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type created (now edfa645)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at edfa645 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type No new revisions were added by this update.
[uima-ruta] 01/01: Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 5e050c2283ac2cbbcac0c3a6af6cb28f3d6cebe5 Merge: edfa645 265069d Author: pkluegl AuthorDate: Tue Aug 25 15:11:22 2020 +0200 Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression UIMA-6261: fixed verbalization of NullExpression and added test .../uima/ruta/verbalize/ExpressionVerbalizer.java | 20 +- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 24 -- 2 files changed, 23 insertions(+), 21 deletions(-)
[uima-ruta] branch master-v2 updated (edfa645 -> 5e050c2)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from edfa645 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type add 265069d UIMA-6261: fixed verbalization of NullExpression and added test new 5e050c2 Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../uima/ruta/verbalize/ExpressionVerbalizer.java | 20 +- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 24 -- 2 files changed, 23 insertions(+), 21 deletions(-)
[uima-ruta] 01/01: Merge branch 'master' into UIMA-6261-verbalization-NullExpression
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch UIMA-6261-verbalization-NullExpression in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit c1207613e19ca5c0d2245fbc6c4e7f5d36855bd9 Merge: 265069d 2cca4b4 Author: Peter Klügl AuthorDate: Tue Aug 25 15:12:52 2020 +0200 Merge branch 'master' into UIMA-6261-verbalization-NullExpression README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 75 --- .../org/apache/uima/ruta/action/FillAction.java| 5 +- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../java/org/apache/uima/ruta/action/FillTest.java | 40 +++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 52 files changed, 597 insertions(+), 571 deletions(-)
[uima-ruta] branch UIMA-6261-verbalization-NullExpression updated (265069d -> c120761)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6261-verbalization-NullExpression in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 265069d UIMA-6261: fixed verbalization of NullExpression and added test add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 from apache/UIMA-6233-Failing-
[uima-ruta] branch master updated (2cca4b4 -> c120761)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 2cca4b4 Merge branch 'UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type' add 265069d UIMA-6261: fixed verbalization of NullExpression and added test add c120761 Merge branch 'master' into UIMA-6261-verbalization-NullExpression No new revisions were added by this update. Summary of changes: .../uima/ruta/verbalize/ExpressionVerbalizer.java | 20 +- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 24 -- 2 files changed, 23 insertions(+), 21 deletions(-)
[uima-ruta] 01/01: Merge pull request #15 from apache/UIMA-6256-SPLIT-creates-invalid-annotations
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 0c3d1ab04583f731c16aeadfc3417105bc64f662 Merge: 5e050c2 39e87be Author: pkluegl AuthorDate: Tue Aug 25 15:18:16 2020 +0200 Merge pull request #15 from apache/UIMA-6256-SPLIT-creates-invalid-annotations Uima 6256 split creates invalid annotations .../org/apache/uima/ruta/action/SplitAction.java | 54 +-- .../uima/ruta/verbalize/ActionVerbalizer.java | 50 -- .../org/apache/uima/ruta/action/SplitTest.java | 77 +++--- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 1 + 4 files changed, 88 insertions(+), 94 deletions(-)
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations updated (fc0d34f -> 39e87be)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6256-SPLIT-creates-invalid-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from fc0d34f UIMA-6256: fixed SPLIT verbalization for explanation add 567b1f4 UIMA-6258: Action FILL only considers first annotation of given type - touch all annotations in list - added test add edfa645 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type add 265069d UIMA-6261: fixed verbalization of NullExpression and added test add 5e050c2 Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression add 39e87be Merge branch 'master-v2' into UIMA-6256-SPLIT-creates-invalid-annotations No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/action/FillAction.java| 5 +-- .../uima/ruta/verbalize/ExpressionVerbalizer.java | 20 +-- .../java/org/apache/uima/ruta/action/FillTest.java | 40 -- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 1 + 4 files changed, 43 insertions(+), 23 deletions(-)
[uima-ruta] branch master-v2 updated (5e050c2 -> 0c3d1ab)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 5e050c2 Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression add e92fc0a UIMA-6256: started with test WIP add d553c37 UIMA-6256: started with test WIP add 6a82b11 UIMA-6256: fixed SPLIT logic add fc0d34f UIMA-6256: fixed SPLIT verbalization for explanation add 39e87be Merge branch 'master-v2' into UIMA-6256-SPLIT-creates-invalid-annotations new 0c3d1ab Merge pull request #15 from apache/UIMA-6256-SPLIT-creates-invalid-annotations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/action/SplitAction.java | 54 +-- .../uima/ruta/verbalize/ActionVerbalizer.java | 50 -- .../org/apache/uima/ruta/action/SplitTest.java | 77 +++--- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 1 + 4 files changed, 88 insertions(+), 94 deletions(-)
[uima-ruta] branch UIMA-6256-SPLIT-creates-invalid-annotations updated (39e87be -> 7fa68db)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6256-SPLIT-creates-invalid-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 39e87be Merge branch 'master-v2' into UIMA-6256-SPLIT-creates-invalid-annotations add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 fr
[uima-ruta] 01/01: Merge branch 'master' into UIMA-6256-SPLIT-creates-invalid-annotations
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 7fa68dbf067ac7a2644d929af9db06a327349159 Merge: 39e87be c120761 Author: Peter Klügl AuthorDate: Tue Aug 25 15:19:44 2020 +0200 Merge branch 'master' into UIMA-6256-SPLIT-creates-invalid-annotations README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 75 --- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 50 files changed, 565 insertions(+), 558 deletions(-)
[uima-ruta] branch master updated (c120761 -> 7fa68db)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from c120761 Merge branch 'master' into UIMA-6261-verbalization-NullExpression add e92fc0a UIMA-6256: started with test WIP add d553c37 UIMA-6256: started with test WIP add 6a82b11 UIMA-6256: fixed SPLIT logic add fc0d34f UIMA-6256: fixed SPLIT verbalization for explanation add edfa645 Merge pull request #13 from apache/UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type add 5e050c2 Merge pull request #14 from apache/UIMA-6261-verbalization-NullExpression add 39e87be Merge branch 'master-v2' into UIMA-6256-SPLIT-creates-invalid-annotations new 7fa68db Merge branch 'master' into UIMA-6256-SPLIT-creates-invalid-annotations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/action/SplitAction.java | 54 +-- .../uima/ruta/verbalize/ActionVerbalizer.java | 50 -- .../org/apache/uima/ruta/action/SplitTest.java | 77 +++--- .../uima/ruta/verbalizer/ScriptVerbalizerTest.java | 1 + 4 files changed, 88 insertions(+), 94 deletions(-)
[uima-ruta] 01/01: UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6268-internal-indexing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 8d986c093f58d49a4cd3d941c683182588f3f708
Author: Peter Klügl
AuthorDate: Thu Oct 1 16:54:11 2020 +0200
UIMA-6268: Ruta: internal indexing not robust concerning modifications in
pipeline
- added test
---
.../uima/ruta/engine/RutaBasicIndexingTest.java| 119 +
1 file changed, 119 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaBasicIndexingTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaBasicIndexingTest.java
new file mode 100644
index 000..ac9955f
--- /dev/null
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaBasicIndexingTest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.ruta.engine;
+
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.fit.util.CasUtil;
+import org.junit.Test;
+
+public class RutaBasicIndexingTest {
+
+ @Test
+ public void testModificatonsInPipeline() throws Exception {
+
+CAS cas = RutaTestUtils.getCAS("This is 1 TEST.");
+
+// initial indexing and create some annotations
+Ruta.apply(cas, "NUM{-> T1}; CAP{-> T2};");
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "1");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "TEST");
+
+// add T1 on CW, remove T2 on CAP
+AnnotationFS at3 = cas.createAnnotation(RutaTestUtils.getTestType(cas, 3),
0, 4);
+cas.addFsToIndexes(at3);
+CasUtil.select(cas, RutaTestUtils.getTestType(cas, 2)).forEach(a ->
cas.removeFsFromIndexes(a));
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "1");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "This");
+
+// apply rules on modifications, 1x partof, 2x startswith, 3x endswith
+Ruta.apply(cas,
"ANY{PARTOF(T1)->T11};ANY{PARTOF(T2)->T12};ANY{PARTOF(T3)->T13};");
+Ruta.apply(cas,
"ANY{STARTSWITH(T1)->T21};ANY{STARTSWITH(T2)->T22};ANY{STARTSWITH(T3)->T23};");
+Ruta.apply(cas,
"ANY{ENDSWITH(T1)->T31};ANY{ENDSWITH(T2)->T32};ANY{ENDSWITH(T3)->T33};");
+
+// partof
+RutaTestUtils.assertAnnotationsEquals(cas, 11, 1, "1");
+RutaTestUtils.assertAnnotationsEquals(cas, 12, 0);
+RutaTestUtils.assertAnnotationsEquals(cas, 13, 1, "This");
+
+// startswith
+RutaTestUtils.assertAnnotationsEquals(cas, 21, 1, "1");
+RutaTestUtils.assertAnnotationsEquals(cas, 22, 0);
+RutaTestUtils.assertAnnotationsEquals(cas, 23, 1, "This");
+
+// endswith
+RutaTestUtils.assertAnnotationsEquals(cas, 31, 1, "1");
+RutaTestUtils.assertAnnotationsEquals(cas, 32, 0);
+RutaTestUtils.assertAnnotationsEquals(cas, 33, 1, "This");
+
+// new round with multiple overlapping annotations
+Ruta.apply(cas, "PERIOD{-> T4}; SW{-> T5};");
+Ruta.apply(cas, "PERIOD{-> T4};");
+
+// remove one T4, add another T5
+AnnotationFS at4 = CasUtil.select(cas, RutaTestUtils.getTestType(cas,
2)).iterator().next();
+cas.removeFsFromIndexes(at4);
+AnnotationFS at5 = cas.createAnnotation(RutaTestUtils.getTestType(cas, 5),
5, 7);
+cas.addFsToIndexes(at5);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, ".");
+RutaTestUtils.assertAnnotationsEquals(cas, 5, 2, "is", "is");
+
+// apply rules on modifications, 1x partof, 2x startswith, 3x endswith
+Ruta.apply(cas, "ANY{PARTOF(T4)->T14};ANY{PARTOF(T5)->T15};");
+Ruta.apply(cas, "ANY{STARTSWITH(T4)->T24};ANY{STARTSWITH(T5)->T25};");
+Ruta.apply(cas, "ANY{ENDSWITH(T4)->T34};ANY{ENDSWITH(T5)->T35};");
+
+// partof
+RutaTestUtils.assertAnnotationsEquals(cas, 14, 1, ".");
+RutaTestUtils.assertAnnotati
[uima-ruta] branch UIMA-6268-internal-indexing created (now 8d986c0)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 8d986c0 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline This branch includes the following new commits: new 8d986c0 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch UIMA-6268-internal-indexing updated (8d986c0 -> a946b26)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch UIMA-6268-internal-indexing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from 8d986c0 UIMA-6268: Ruta: internal indexing not robust concerning
modifications in pipeline
add a946b26 UIMA-6268: Ruta: internal indexing not robust concerning
modifications in pipeline
No new revisions were added by this update.
Summary of changes:
.../{RutaElement.java => IndexUpdateMode.java} | 53 ++---
.../java/org/apache/uima/ruta/RutaBasicUtils.java | 132
.../main/java/org/apache/uima/ruta/RutaStream.java | 238 ++---
.../org/apache/uima/ruta/engine/RutaEngine.java| 15 +-
.../org/apache/uima/ruta/IndexUpdateModeTest.java | 232
.../uima/ruta/engine/RutaBasicIndexingTest.java| 119 ---
6 files changed, 570 insertions(+), 219 deletions(-)
copy ruta-core/src/main/java/org/apache/uima/ruta/{RutaElement.java =>
IndexUpdateMode.java} (87%)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
create mode 100644
ruta-core/src/test/java/org/apache/uima/ruta/IndexUpdateModeTest.java
delete mode 100644
ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaBasicIndexingTest.java
[uima-ruta] branch UIMA-6268-internal-indexing updated (a946b26 -> f2f9d78)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from a946b26 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add f2f9d78 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline No new revisions were added by this update. Summary of changes: .../java/org/apache/uima/ruta/IndexUpdateMode.java | 30 +++- .../main/java/org/apache/uima/ruta/RutaStream.java | 150 ++-- .../org/apache/uima/ruta/EmptyDocumentTest.java| 3 +- .../org/apache/uima/ruta/IndexUpdateModeTest.java | 199 - .../apache/uima/ruta/ZeroLengthAnnotationTest.java | 45 ++--- .../uima/ruta/resource/TreeWordListTest.java | 4 +- ruta-docbook/src/docbook/tools.ruta.overview.xml | 17 ++ 7 files changed, 361 insertions(+), 87 deletions(-)
[uima-ruta] branch UIMA-6268-internal-indexing updated (f2f9d78 -> 595458c)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch UIMA-6268-internal-indexing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from f2f9d78 UIMA-6268: Ruta: internal indexing not robust concerning
modifications in pipeline
add 595458c TM-760: Extend document of MeasurementAnnotator
No new revisions were added by this update.
Summary of changes:
.../{IndexUpdateMode.java => ReindexUpdateMode.java} | 2 +-
.../src/main/java/org/apache/uima/ruta/RutaStream.java | 8
.../java/org/apache/uima/ruta/engine/RutaEngine.java | 16
...dexUpdateModeTest.java => ReindexUpdateModeTest.java} | 10 +-
.../org/apache/uima/ruta/resource/TreeWordListTest.java | 4 ++--
5 files changed, 20 insertions(+), 20 deletions(-)
rename ruta-core/src/main/java/org/apache/uima/ruta/{IndexUpdateMode.java =>
ReindexUpdateMode.java} (98%)
rename ruta-core/src/test/java/org/apache/uima/ruta/{IndexUpdateModeTest.java
=> ReindexUpdateModeTest.java} (97%)
[uima-ruta] branch UIMA-6268-internal-indexing updated (595458c -> 7d246dc)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 595458c TM-760: Extend document of MeasurementAnnotator add 7d246dc TM-760: Extend document of MeasurementAnnotator No new revisions were added by this update. Summary of changes: ruta-core/src/main/java/org/apache/uima/ruta/ReindexUpdateMode.java | 3 +++ 1 file changed, 3 insertions(+)
[uima-ruta] branch UIMA-6268-internal-indexing updated (7d246dc -> ff13915)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7d246dc TM-760: Extend document of MeasurementAnnotator add 974725c UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add ff13915 Merge branch 'UIMA-6268-internal-indexing' of https://github.com/apache/uima-ruta into UIMA-6268-internal-indexing No new revisions were added by this update. Summary of changes:
[uima-ruta] branch UIMA-6268-internal-indexing updated (ff13915 -> 2f76fee)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ff13915 Merge branch 'UIMA-6268-internal-indexing' of https://github.com/apache/uima-ruta into UIMA-6268-internal-indexing add 2f76fee UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline No new revisions were added by this update. Summary of changes: .../uima/ruta/RutaIndexingConfiguration.java | 117 .../main/java/org/apache/uima/ruta/RutaStream.java | 151 + .../org/apache/uima/ruta/engine/RutaEngine.java| 77 +-- .../org/apache/uima/ruta/IndexSkipTypesTest.java | 70 ++ .../org/apache/uima/ruta/ReindexSkipTypesTest.java | 66 + .../uima/ruta/resource/TreeWordListTest.java | 9 +- ruta-docbook/src/docbook/tools.ruta.overview.xml | 103 +++--- 7 files changed, 533 insertions(+), 60 deletions(-) create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/RutaIndexingConfiguration.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/IndexSkipTypesTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/ReindexSkipTypesTest.java
[uima-ruta] branch UIMA-6268-internal-indexing updated (2f76fee -> 776cffd)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 2f76fee UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 776cffd UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline No new revisions were added by this update. Summary of changes: .../tools.ruta.language.internal_indexing.xml | 152 + ruta-docbook/src/docbook/tools.ruta.language.xml | 3 + 2 files changed, 155 insertions(+) create mode 100644 ruta-docbook/src/docbook/tools.ruta.language.internal_indexing.xml
[uima-ruta] branch UIMA-6268-internal-indexing updated (776cffd -> cf62401)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 776cffd UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add cf62401 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline No new revisions were added by this update. Summary of changes: ruta-docbook/src/docbook/tools.ruta.language.internal_indexing.xml | 3 --- 1 file changed, 3 deletions(-)
[uima-ruta] branch master-v2 updated (0c3d1ab -> 7400101)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 0c3d1ab Merge pull request #15 from apache/UIMA-6256-SPLIT-creates-invalid-annotations add 8d986c0 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add a946b26 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add f2f9d78 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 595458c TM-760: Extend document of MeasurementAnnotator add 974725c UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 7d246dc TM-760: Extend document of MeasurementAnnotator add ff13915 Merge branch 'UIMA-6268-internal-indexing' of https://github.com/apache/uima-ruta into UIMA-6268-internal-indexing add 2f76fee UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 776cffd UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add cf62401 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline new 7400101 Merge pull request #16 from apache/UIMA-6268-internal-indexing The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/ReindexUpdateMode.java| 58 +++ .../java/org/apache/uima/ruta/RutaBasicUtils.java | 132 +++ .../uima/ruta/RutaIndexingConfiguration.java | 117 ++ .../main/java/org/apache/uima/ruta/RutaStream.java | 385 ++ .../org/apache/uima/ruta/engine/RutaEngine.java| 90 - .../org/apache/uima/ruta/EmptyDocumentTest.java| 3 +- .../org/apache/uima/ruta/IndexSkipTypesTest.java | 70 .../org/apache/uima/ruta/ReindexSkipTypesTest.java | 66 .../apache/uima/ruta/ReindexUpdateModeTest.java| 429 + .../apache/uima/ruta/ZeroLengthAnnotationTest.java | 45 +-- .../uima/ruta/resource/TreeWordListTest.java | 9 +- .../tools.ruta.language.internal_indexing.xml | 149 +++ ruta-docbook/src/docbook/tools.ruta.language.xml | 3 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 120 +- 14 files changed, 1536 insertions(+), 140 deletions(-) create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/ReindexUpdateMode.java create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/RutaIndexingConfiguration.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/IndexSkipTypesTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/ReindexSkipTypesTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java create mode 100644 ruta-docbook/src/docbook/tools.ruta.language.internal_indexing.xml
[uima-ruta] 01/01: Merge pull request #16 from apache/UIMA-6268-internal-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 74001014613f89b8329b0b83461a55c098d8063d Merge: 0c3d1ab cf62401 Author: pkluegl AuthorDate: Fri Oct 9 22:29:06 2020 +0200 Merge pull request #16 from apache/UIMA-6268-internal-indexing WIP: UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipelin .../org/apache/uima/ruta/ReindexUpdateMode.java| 58 +++ .../java/org/apache/uima/ruta/RutaBasicUtils.java | 132 +++ .../uima/ruta/RutaIndexingConfiguration.java | 117 ++ .../main/java/org/apache/uima/ruta/RutaStream.java | 385 ++ .../org/apache/uima/ruta/engine/RutaEngine.java| 90 - .../org/apache/uima/ruta/EmptyDocumentTest.java| 3 +- .../org/apache/uima/ruta/IndexSkipTypesTest.java | 70 .../org/apache/uima/ruta/ReindexSkipTypesTest.java | 66 .../apache/uima/ruta/ReindexUpdateModeTest.java| 429 + .../apache/uima/ruta/ZeroLengthAnnotationTest.java | 45 +-- .../uima/ruta/resource/TreeWordListTest.java | 9 +- .../tools.ruta.language.internal_indexing.xml | 149 +++ ruta-docbook/src/docbook/tools.ruta.language.xml | 3 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 120 +- 14 files changed, 1536 insertions(+), 140 deletions(-)
[uima-ruta] branch UIMA-6268-internal-indexing updated (cf62401 -> 3933cc4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from cf62401 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 from apache/UIMA-62
[uima-ruta] 01/01: Merge branch 'master' into UIMA-6268-internal-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch UIMA-6268-internal-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 3933cc4c8c6c93c093e59607998122d59457dad0 Merge: cf62401 7fa68db Author: Peter Klügl AuthorDate: Mon Oct 12 10:06:38 2020 +0200 Merge branch 'master' into UIMA-6268-internal-indexing # Conflicts: # ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 74 --- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 50 files changed, 564 insertions(+), 558 deletions(-) diff --cc ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java index a63c052,f9a2d07..53bce8a --- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java +++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java @@@ -53,8 -53,6 +53,7 @@@ import org.apache.uima.cas.IntArrayFS import org.apache.uima.cas.StringArrayFS; import org.apache.uima.cas.Type; import org.apache.uima.cas.TypeSystem; - import org.apache.uima.cas.impl.FSIteratorImplBase; +import org.apache.uima.cas.impl.TypeImpl; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.cas.text.AnnotationIndex; import org.apache.uima.fit.util.CasUtil;
[uima-ruta] 01/01: Merge pull request #17 from apache/UIMA-6268-internal-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit ce0646fff25d6acce82cfcbe45dca2bf53269a63 Merge: 7fa68db 3933cc4 Author: pkluegl AuthorDate: Mon Oct 12 10:09:00 2020 +0200 Merge pull request #17 from apache/UIMA-6268-internal-indexing Uima 6268 internal indexing .../org/apache/uima/ruta/ReindexUpdateMode.java| 58 +++ .../java/org/apache/uima/ruta/RutaBasicUtils.java | 132 +++ .../uima/ruta/RutaIndexingConfiguration.java | 117 ++ .../main/java/org/apache/uima/ruta/RutaStream.java | 386 ++ .../org/apache/uima/ruta/engine/RutaEngine.java| 90 - .../org/apache/uima/ruta/EmptyDocumentTest.java| 3 +- .../org/apache/uima/ruta/IndexSkipTypesTest.java | 70 .../org/apache/uima/ruta/ReindexSkipTypesTest.java | 66 .../apache/uima/ruta/ReindexUpdateModeTest.java| 429 + .../apache/uima/ruta/ZeroLengthAnnotationTest.java | 45 +-- .../uima/ruta/resource/TreeWordListTest.java | 9 +- .../tools.ruta.language.internal_indexing.xml | 149 +++ ruta-docbook/src/docbook/tools.ruta.language.xml | 3 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 120 +- 14 files changed, 1536 insertions(+), 141 deletions(-)
[uima-ruta] branch master updated (7fa68db -> ce0646f)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7fa68db Merge branch 'master' into UIMA-6256-SPLIT-creates-invalid-annotations add 0c3d1ab Merge pull request #15 from apache/UIMA-6256-SPLIT-creates-invalid-annotations add 8d986c0 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add a946b26 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add f2f9d78 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 595458c TM-760: Extend document of MeasurementAnnotator add 974725c UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 7d246dc TM-760: Extend document of MeasurementAnnotator add ff13915 Merge branch 'UIMA-6268-internal-indexing' of https://github.com/apache/uima-ruta into UIMA-6268-internal-indexing add 2f76fee UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 776cffd UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add cf62401 UIMA-6268: Ruta: internal indexing not robust concerning modifications in pipeline add 3933cc4 Merge branch 'master' into UIMA-6268-internal-indexing new ce0646f Merge pull request #17 from apache/UIMA-6268-internal-indexing The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/ReindexUpdateMode.java| 58 +++ .../java/org/apache/uima/ruta/RutaBasicUtils.java | 132 +++ .../uima/ruta/RutaIndexingConfiguration.java | 117 ++ .../main/java/org/apache/uima/ruta/RutaStream.java | 386 ++ .../org/apache/uima/ruta/engine/RutaEngine.java| 90 - .../org/apache/uima/ruta/EmptyDocumentTest.java| 3 +- .../org/apache/uima/ruta/IndexSkipTypesTest.java | 70 .../org/apache/uima/ruta/ReindexSkipTypesTest.java | 66 .../apache/uima/ruta/ReindexUpdateModeTest.java| 429 + .../apache/uima/ruta/ZeroLengthAnnotationTest.java | 45 +-- .../uima/ruta/resource/TreeWordListTest.java | 9 +- .../tools.ruta.language.internal_indexing.xml | 149 +++ ruta-docbook/src/docbook/tools.ruta.language.xml | 3 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 120 +- 14 files changed, 1536 insertions(+), 141 deletions(-) create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/ReindexUpdateMode.java create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java create mode 100644 ruta-core/src/main/java/org/apache/uima/ruta/RutaIndexingConfiguration.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/IndexSkipTypesTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/ReindexSkipTypesTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java create mode 100644 ruta-docbook/src/docbook/tools.ruta.language.internal_indexing.xml
[uima-ruta] 01/01: UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6271-validate-internal-ruta-indexing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 26674c9034cff974abe91acf6287f7cc3dcce31c
Author: Peter Klügl
AuthorDate: Tue Oct 13 16:57:33 2020 +0200
UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
- added config param
- added utils method with tests
- added mention in docs
---
ruta-core/pom.xml | 18
.../java/org/apache/uima/ruta/RutaBasicUtils.java | 116 +
.../org/apache/uima/ruta/engine/RutaEngine.java| 20
.../org/apache/uima/ruta/RutaBasicUtilsTest.java | 116 +
ruta-docbook/src/docbook/tools.ruta.overview.xml | 18
ruta-parent/pom.xml| 2 +-
6 files changed, 289 insertions(+), 1 deletion(-)
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 76072d2..cc4e9b9 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -150,6 +150,24 @@
junit
test
+
+
+ org.apache.uima
+ uimafit-junit
+ ${uimafit-version}
+ test
+
+
+
+ org.springframework
+ spring-aop
+
+
+ aopalliance
+ aopalliance
+
+
+
org.slf4j
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
b/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
index 5eb2841..f371d49 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
@@ -18,14 +18,22 @@
*/
package org.apache.uima.ruta;
+import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.fit.util.CasUtil;
+import org.apache.uima.fit.util.JCasUtil;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.ruta.type.RutaBasic;
/**
@@ -129,4 +137,112 @@ public class RutaBasicUtils {
return true;
}
+ /**
+ * This method validated the internal indexing, i.e. the information stored
in the RutaBasics, and
+ * throw exceptions if a invalid state is discovered.
+ *
+ * @param jcas
+ * the JCas that should be validated
+ * @param ignoreTypeNames
+ * the names of types that should not be validated
+ * @throws AnalysisEngineProcessException
+ * if some problem was detected
+ */
+ public static void validateInternalIndexing(JCas jcas, Collection
ignoreTypeNames)
+ throws AnalysisEngineProcessException {
+
+Map beginMap = new LinkedHashMap<>();
+Map endMap = new LinkedHashMap<>();
+
+Collection basics = JCasUtil.select(jcas, RutaBasic.class);
+
+if (basics.isEmpty()) {
+ throw new AnalysisEngineProcessException(
+ new IllegalStateException("No RutaBasics available!"));
+}
+for (RutaBasic rutaBasic : basics) {
+
+ int begin = rutaBasic.getBegin();
+ int end = rutaBasic.getEnd();
+
+ if (beginMap.get(begin) != null || endMap.get(end) != null) {
+throw new AnalysisEngineProcessException(new IllegalStateException(
+"RutaBasic must be disjunct! Problem at offset " + begin));
+ }
+
+ beginMap.put(begin, rutaBasic);
+ endMap.put(end, rutaBasic);
+}
+
+for (Annotation annotation : JCasUtil.select(jcas, Annotation.class)) {
+
+ Type type = annotation.getType();
+ if (ignoreType(type, ignoreTypeNames, jcas)) {
+continue;
+ }
+
+ int begin = annotation.getBegin();
+ int end = annotation.getEnd();
+
+ RutaBasic beginBasic = beginMap.get(begin);
+ RutaBasic endBasic = endMap.get(end);
+ if (beginBasic == null) {
+throw new AnalysisEngineProcessException(new IllegalStateException(
+"No RutaBasic for begin of annotation at offset " + begin));
+ }
+ if (endBasic == null) {
+throw new AnalysisEngineProcessException(
+new IllegalStateException("No RutaBasic for end of annotation
at offset " + end));
+ }
+
+ Collection beginAnchors = beginBasic.getBeginAnchors(type);
+ if (beginAnchors == null || !beginAnchors.contains(annotation)) {
+throw new AnalysisEngineProcessException(new
IllegalStateException("Annotation of type '"
++ type.getName() + "' not regi
[uima-ruta] branch UIMA-6271-validate-internal-ruta-indexing created (now 26674c9)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6271-validate-internal-ruta-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 26674c9 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine This branch includes the following new commits: new 26674c9 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: Merge pull request #18 from apache/UIMA-6271-validate-internal-ruta-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit b2f2fc187391790b9c3c4757eb6a59009e0e0acf Merge: 7400101 26674c9 Author: pkluegl AuthorDate: Thu Oct 15 12:04:35 2020 +0200 Merge pull request #18 from apache/UIMA-6271-validate-internal-ruta-indexing UIMA-6271: Ruta: option to validate internal indexing in RutaEngine ruta-core/pom.xml | 18 .../java/org/apache/uima/ruta/RutaBasicUtils.java | 116 + .../org/apache/uima/ruta/engine/RutaEngine.java| 20 .../org/apache/uima/ruta/RutaBasicUtilsTest.java | 116 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 18 ruta-parent/pom.xml| 2 +- 6 files changed, 289 insertions(+), 1 deletion(-)
[uima-ruta] branch master-v2 updated (7400101 -> b2f2fc1)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7400101 Merge pull request #16 from apache/UIMA-6268-internal-indexing add 26674c9 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine new b2f2fc1 Merge pull request #18 from apache/UIMA-6271-validate-internal-ruta-indexing The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ruta-core/pom.xml | 18 .../java/org/apache/uima/ruta/RutaBasicUtils.java | 116 + .../org/apache/uima/ruta/engine/RutaEngine.java| 20 .../org/apache/uima/ruta/RutaBasicUtilsTest.java | 116 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 18 ruta-parent/pom.xml| 2 +- 6 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
[uima-ruta] 01/01: Merge branch 'master' into UIMA-6271-validate-internal-ruta-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch UIMA-6271-validate-internal-ruta-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit a2ceebd94ef93fe9119bafcad93048e6c3c1105d Merge: 26674c9 ce0646f Author: Peter Klügl AuthorDate: Thu Oct 15 12:07:30 2020 +0200 Merge branch 'master' into UIMA-6271-validate-internal-ruta-indexing # Conflicts: # ruta-parent/pom.xml README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 74 --- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 50 files changed, 564 insertions(+), 558 deletions(-) diff --cc ruta-parent/pom.xml index 5f70f13,f604200..8807769 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@@ -130,8 -130,8 +130,8 @@@ (http://www.famfamfam.com/lab/icons/silk/), licensed under the Creative Commons Attribution 3.0 License. - 2.10.4 - 2.5.1-SNAPSHOT + 3.1.1 -3.0.0 ++3.1.1-SNAPSHOT 4.3.22.RELEASE
[uima-ruta] branch UIMA-6271-validate-internal-ruta-indexing updated (26674c9 -> a2ceebd)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6271-validate-internal-ruta-indexing in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 26674c9 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1 Merge pull request #3 from apache/UIMA-6233-Fa
[uima-ruta] 01/01: Merge pull request #19 from apache/UIMA-6271-validate-internal-ruta-indexing
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit d328681d9231da0159e825865db0729a535bff89 Merge: ce0646f a2ceebd Author: pkluegl AuthorDate: Thu Oct 15 12:08:45 2020 +0200 Merge pull request #19 from apache/UIMA-6271-validate-internal-ruta-indexing Uima 6271 validate internal ruta indexing ruta-core/pom.xml | 18 .../java/org/apache/uima/ruta/RutaBasicUtils.java | 116 + .../org/apache/uima/ruta/engine/RutaEngine.java| 20 .../org/apache/uima/ruta/RutaBasicUtilsTest.java | 116 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 18 ruta-parent/pom.xml| 2 +- 6 files changed, 289 insertions(+), 1 deletion(-)
[uima-ruta] branch master updated (ce0646f -> d328681)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ce0646f Merge pull request #17 from apache/UIMA-6268-internal-indexing add 7400101 Merge pull request #16 from apache/UIMA-6268-internal-indexing add 26674c9 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine add a2ceebd Merge branch 'master' into UIMA-6271-validate-internal-ruta-indexing new d328681 Merge pull request #19 from apache/UIMA-6271-validate-internal-ruta-indexing The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ruta-core/pom.xml | 18 .../java/org/apache/uima/ruta/RutaBasicUtils.java | 116 + .../org/apache/uima/ruta/engine/RutaEngine.java| 20 .../org/apache/uima/ruta/RutaBasicUtilsTest.java | 116 + ruta-docbook/src/docbook/tools.ruta.overview.xml | 18 ruta-parent/pom.xml| 2 +- 6 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
[uima-ruta] branch master-v2 updated: UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch master-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/master-v2 by this push:
new 5f05845 UIMA-6271: Ruta: option to validate internal indexing in
RutaEngine
5f05845 is described below
commit 5f05845d5deb758c54c4ff5ee8e60af51a196f8b
Author: Peter Klügl
AuthorDate: Thu Oct 15 16:15:04 2020 +0200
UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
- go back to released uimafit version and replace managedJCas fro now in
test
---
ruta-core/pom.xml | 34 +++---
.../org/apache/uima/ruta/RutaBasicUtilsTest.java | 24 +--
ruta-parent/pom.xml| 2 +-
3 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index cc4e9b9..5356837 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -151,23 +151,23 @@
test
-
- org.apache.uima
- uimafit-junit
- ${uimafit-version}
- test
-
-
-
- org.springframework
- spring-aop
-
-
- aopalliance
- aopalliance
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.slf4j
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
index 89e11e2..bf55a78 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
@@ -22,17 +22,35 @@ import java.util.Arrays;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.fit.testing.junit.ManagedJCas;
+import org.apache.uima.fit.factory.JCasFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.type.CW;
import org.apache.uima.ruta.type.RutaBasic;
-import org.junit.Rule;
+import org.junit.Before;
import org.junit.Test;
public class RutaBasicUtilsTest {
- public @Rule ManagedJCas managedJCas = new ManagedJCas();
+ // TODO use uimafit when released instead
+ // public @Rule ManagedJCas managedJCas = new ManagedJCas();
+
+ private static ThreadLocal managedJCas = new ThreadLocal<>();
+
+ static {
+
+try {
+ JCas jCas = JCasFactory.createJCas();
+ managedJCas.set(jCas);
+} catch (Exception e) {
+ throw new IllegalStateException(e);
+}
+ }
+
+ @Before
+ public void setup() {
+managedJCas.get().reset();
+ }
@Test(expected = AnalysisEngineProcessException.class)
public void testBreakOnNoBasics() throws AnalysisEngineProcessException {
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 5f70f13..5492b12 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -131,7 +131,7 @@
Creative Commons Attribution 3.0 License.
2.10.4
-2.5.1-SNAPSHOT
+2.5.0
4.3.22.RELEASE
[uima-ruta] branch master updated: UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/master by this push:
new 970575d UIMA-6271: Ruta: option to validate internal indexing in
RutaEngine
970575d is described below
commit 970575dac0472554f91106370cfd2d705c0b9582
Author: Peter Klügl
AuthorDate: Thu Oct 15 16:19:53 2020 +0200
UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
- go back to released uimafit version and replace managedJCas fro now in
test
---
ruta-core/pom.xml | 34 +++---
.../org/apache/uima/ruta/RutaBasicUtilsTest.java | 24 +--
ruta-parent/pom.xml| 2 +-
3 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index bf8bdac..98423c7 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -152,23 +152,23 @@
test
-
- org.apache.uima
- uimafit-junit
- ${uimafit-version}
- test
-
-
-
- org.springframework
- spring-aop
-
-
- aopalliance
- aopalliance
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.slf4j
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
index 89e11e2..bf55a78 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/RutaBasicUtilsTest.java
@@ -22,17 +22,35 @@ import java.util.Arrays;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.fit.testing.junit.ManagedJCas;
+import org.apache.uima.fit.factory.JCasFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.type.CW;
import org.apache.uima.ruta.type.RutaBasic;
-import org.junit.Rule;
+import org.junit.Before;
import org.junit.Test;
public class RutaBasicUtilsTest {
- public @Rule ManagedJCas managedJCas = new ManagedJCas();
+ // TODO use uimafit when released instead
+ // public @Rule ManagedJCas managedJCas = new ManagedJCas();
+
+ private static ThreadLocal managedJCas = new ThreadLocal<>();
+
+ static {
+
+try {
+ JCas jCas = JCasFactory.createJCas();
+ managedJCas.set(jCas);
+} catch (Exception e) {
+ throw new IllegalStateException(e);
+}
+ }
+
+ @Before
+ public void setup() {
+managedJCas.get().reset();
+ }
@Test(expected = AnalysisEngineProcessException.class)
public void testBreakOnNoBasics() throws AnalysisEngineProcessException {
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 8807769..537a602 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -131,7 +131,7 @@
Creative Commons Attribution 3.0 License.
3.1.1
-3.1.1-SNAPSHOT
+3.1.0
4.3.22.RELEASE
[uima-ruta] branch master updated: no jira - deactivate test for now
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/master by this push:
new 356b511 no jira - deactivate test for now
356b511 is described below
commit 356b511ee828fbe3e29d03eb6b8255e965a42145
Author: Peter Klügl
AuthorDate: Mon Oct 19 14:15:07 2020 +0200
no jira - deactivate test for now
---
ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java
index 86e24e9..dd054d3 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/ReindexUpdateModeTest.java
@@ -27,6 +27,7 @@ import org.apache.uima.fit.util.CasUtil;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
+import org.junit.Ignore;
import org.junit.Test;
public class ReindexUpdateModeTest {
@@ -230,6 +231,7 @@ public class ReindexUpdateModeTest {
}
@Test
+ @Ignore
public void testSafeAdditive() throws Exception {
Map params = new LinkedHashMap<>();
[uima-ruta] 01/01: UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6281-uimaFIT-coveredBy
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit c0d655f8f8564d2cc114f4b05c0dca3fd623dc70
Author: Peter Klügl
AuthorDate: Mon Oct 19 19:18:04 2020 +0200
UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
- replace method in RutaStream method
---
.../src/main/java/org/apache/uima/ruta/RutaStream.java | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
index 53bce8a..2b49ea5 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
@@ -61,7 +61,6 @@ import org.apache.uima.fit.util.FSCollectionFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.ruta.block.RutaBlock;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.expression.AnnotationTypeExpression;
import org.apache.uima.ruta.expression.IRutaExpression;
import org.apache.uima.ruta.expression.annotation.IAnnotationExpression;
@@ -1131,15 +1130,15 @@ public class RutaStream {
if (windowAnnotation != null
&& (windowAnnotation.getBegin() !=
cas.getDocumentAnnotation().getBegin()
|| windowAnnotation.getEnd() !=
cas.getDocumentAnnotation().getEnd())) {
- AnnotationFS frame =
cas.createAnnotation(cas.getTypeSystem().getType(RutaEngine.FRAME_TYPE),
- windowAnnotation.getBegin(), windowAnnotation.getEnd());
- FSIterator iterator =
cas.getAnnotationIndex(type).select().coveredBy(frame)
- .fsIterator();
- // was: FSIterator subiterator =
- // cas.getAnnotationIndex(type).subiterator(frame);
- while (iterator.hasNext()) {
-AnnotationFS each = iterator.next();
+ List selectCovered = CasUtil.selectCovered(cas, type,
windowAnnotation);
+ if (cas.getTypeSystem().subsumes(type, windowAnnotation.getType())) {
+if (isVisible(windowAnnotation)) {
+ result.add(windowAnnotation);
+}
+ }
+
+ for (AnnotationFS each : selectCovered) {
if (isVisible(each)) {
result.add(each);
}
[uima-ruta] branch UIMA-6281-uimaFIT-coveredBy created (now c0d655f)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6281-uimaFIT-coveredBy in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at c0d655f UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally This branch includes the following new commits: new c0d655f UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch UIMA-6281-uimaFIT-coveredBy updated: UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6281-uimaFIT-coveredBy
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/UIMA-6281-uimaFIT-coveredBy by
this push:
new e1aacd2 UIMA-6281: Ruta: use uimaFIT instead of
CAS.select().coveredBy() internally
e1aacd2 is described below
commit e1aacd22a99d3280aa591223739f7265d55865f9
Author: Peter Klügl
AuthorDate: Tue Oct 20 10:25:42 2020 +0200
UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
- refactoring and TODO comments
---
.../java/org/apache/uima/ruta/FilterManager.java | 1 +
.../main/java/org/apache/uima/ruta/RutaStream.java | 46 +++---
.../apache/uima/ruta/rule/WildCardRuleElement.java | 5 +--
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
b/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
index 855ff9b..8dc7110 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
@@ -194,6 +194,7 @@ public class FilterManager {
public FSIterator createFilteredIterator(CAS cas, Type
basicType) {
if (windowAnnotation != null) {
+ // TODO: UIMA-6281 replace select
FSIterator windowIt =
cas.getAnnotationIndex(basicType).select()
.coveredBy(windowAnnotation).fsIterator();
// was: FSIterator windowIt =
cas.getAnnotationIndex(basicType)
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
index 2b49ea5..1cdd40c 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
@@ -203,6 +203,7 @@ public class RutaStream {
private void updateIterators(CAS cas, Type basicType, FilterManager filter,
AnnotationFS additionalWindow) {
if (additionalWindow != null) {
+ // TODO UIMA-6281 replace select
this.basicIt =
cas.getAnnotationIndex(basicType).select().coveredBy(additionalWindow)
.fsIterator();
// was: this.basicIt =
cas.getAnnotationIndex(basicType).subiterator(additionalWindow);
@@ -783,16 +784,7 @@ public class RutaStream {
public List getAnnotationsInWindow(AnnotationFS
windowAnnotation, Type type) {
-if (windowAnnotation == null || type == null) {
- return Collections.emptyList();
-}
-TypeSystem typeSystem = getCas().getTypeSystem();
-List result = new ArrayList<>();
-if (typeSystem.subsumes(type, windowAnnotation.getType())) {
- result.add(windowAnnotation);
-}
-result.addAll(CasUtil.selectCovered(cas, type, windowAnnotation));
-return result;
+return getAnnotationsInWindow(type, windowAnnotation, false);
}
public Collection getAllBasicsInWindow(AnnotationFS
windowAnnotation) {
@@ -864,6 +856,7 @@ public class RutaStream {
return result;
}
FSMatchConstraint defaultConstraint = filter.getDefaultConstraint();
+// TODO UIMA-6281 replace select
FSIterator iterator = cas.createFilteredIterator(
cas.getAnnotationIndex(basicType).select().coveredBy(windowAnnotation).fsIterator(),
defaultConstraint);
@@ -1131,18 +1124,7 @@ public class RutaStream {
&& (windowAnnotation.getBegin() !=
cas.getDocumentAnnotation().getBegin()
|| windowAnnotation.getEnd() !=
cas.getDocumentAnnotation().getEnd())) {
- List selectCovered = CasUtil.selectCovered(cas, type,
windowAnnotation);
- if (cas.getTypeSystem().subsumes(type, windowAnnotation.getType())) {
-if (isVisible(windowAnnotation)) {
- result.add(windowAnnotation);
-}
- }
-
- for (AnnotationFS each : selectCovered) {
-if (isVisible(each)) {
- result.add(each);
-}
- }
+ return getAnnotationsInWindow(type, windowAnnotation, true);
} else {
AnnotationIndex annotationIndex =
cas.getAnnotationIndex(type);
for (AnnotationFS each : annotationIndex) {
@@ -1154,6 +1136,26 @@ public class RutaStream {
return result;
}
+ public List getAnnotationsInWindow(Type type, AnnotationFS
windowAnnotation,
+ boolean sensitiveToVisibility) {
+
+List result = new LinkedList<>();
+
+if (cas.getTypeSystem().subsumes(type, windowAnnotation.getType())) {
+ if (!sensitiveToVisibility || isVisible(windowAnnotation)) {
+result.add(windowAnnotation);
+ }
+}
+
+List selectCovered = CasUtil.selectCovered(cas, type,
windowAnnotation);
+for (AnnotationFS each : selectCovered) {
+ if (!sensitiveToVisibility || isVisible(each)) {
+result.add(each);
+ }
+}
+return result;
+
[uima-ruta] branch UIMA-6281-uimaFIT-coveredBy updated: UIMA-6281: fix method for null arguments
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6281-uimaFIT-coveredBy
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/UIMA-6281-uimaFIT-coveredBy by
this push:
new 4d2b15e UIMA-6281: fix method for null arguments
4d2b15e is described below
commit 4d2b15e675ae8c25d775c1504831489b7b8e916f
Author: Peter Klügl
AuthorDate: Thu Oct 22 22:15:48 2020 +0200
UIMA-6281: fix method for null arguments
---
ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java | 4
1 file changed, 4 insertions(+)
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
index 1cdd40c..08a53d8 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
@@ -1139,6 +1139,10 @@ public class RutaStream {
public List getAnnotationsInWindow(Type type, AnnotationFS
windowAnnotation,
boolean sensitiveToVisibility) {
+if (type == null || windowAnnotation == null) {
+ return Collections.emptyList();
+}
+
List result = new LinkedList<>();
if (cas.getTypeSystem().subsumes(type, windowAnnotation.getType())) {
[uima-ruta] 01/01: Merge pull request #20 from apache/UIMA-6281-uimaFIT-coveredBy
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 1b614232093fd33014e751b85b9c53e7fafb805c Merge: 356b511 4d2b15e Author: pkluegl AuthorDate: Mon Oct 26 14:55:47 2020 +0100 Merge pull request #20 from apache/UIMA-6281-uimaFIT-coveredBy UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally .../java/org/apache/uima/ruta/FilterManager.java | 1 + .../main/java/org/apache/uima/ruta/RutaStream.java | 51 -- .../apache/uima/ruta/rule/WildCardRuleElement.java | 5 +-- 3 files changed, 31 insertions(+), 26 deletions(-)
[uima-ruta] branch master updated (356b511 -> 1b61423)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 356b511 no jira - deactivate test for now add c0d655f UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally add e1aacd2 UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally add 4d2b15e UIMA-6281: fix method for null arguments new 1b61423 Merge pull request #20 from apache/UIMA-6281-uimaFIT-coveredBy The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/uima/ruta/FilterManager.java | 1 + .../main/java/org/apache/uima/ruta/RutaStream.java | 51 -- .../apache/uima/ruta/rule/WildCardRuleElement.java | 5 +-- 3 files changed, 31 insertions(+), 26 deletions(-)
[uima-ruta] 01/01: UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 36b46fa61e0180415b513ed78070f63dc324dcf2
Author: Peter Klügl
AuthorDate: Fri Dec 4 12:20:19 2020 +0100
UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views
- fixed missing check for FSFeatureTreeNode
- moved some dispose() in order to avoid potential NPEe
---
.../org/apache/uima/ruta/check/AnnotationCheckComposite.java | 10 +-
.../apache/uima/ruta/explain/rulelist/RuleListViewPage.java| 2 +-
.../java/org/apache/uima/ruta/query/ui/QueryComposite.java | 2 +-
.../uima/ruta/testing/ui/views/EvaluationContentProvider.java | 5 +
.../uima/ruta/testing/ui/views/EvaluationLabelProvider.java| 5 +++--
.../apache/uima/ruta/testing/ui/views/EvaluationViewPage.java | 6 +++---
.../java/org/apache/uima/ruta/testing/ui/views/InfoPanel.java | 2 +-
.../org/apache/uima/ruta/testing/ui/views/TestViewPage.java| 1 +
.../uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java | 5 -
ruta-ep-engine/pom.xml | 2 +-
10 files changed, 25 insertions(+), 15 deletions(-)
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckComposite.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckComposite.java
index f043f17..47e384c 100644
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckComposite.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckComposite.java
@@ -334,12 +334,12 @@ public class AnnotationCheckComposite extends Composite
*/
@Override
public void dispose() {
+ viewPart.getSite().getPage().removeSelectionListener(this);
+ Collection values = images.values();
+ for (Image image : values) {
+ image.dispose();
+ }
super.dispose();
-viewPart.getSite().getPage().removeSelectionListener(this);
-Collection values = images.values();
-for (Image image : values) {
- image.dispose();
-}
}
public Image getImage(String name) {
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListViewPage.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListViewPage.java
index c960e81..dee192b 100755
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListViewPage.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListViewPage.java
@@ -129,8 +129,8 @@ public class RuleListViewPage extends ApplyViewPage
implements Listener {
*/
@Override
public void dispose() {
-super.dispose();
overlay.dispose();
+super.dispose();
}
/*
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
index fd76b1f..745df48 100755
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
@@ -604,12 +604,12 @@ public class QueryComposite extends
org.eclipse.swt.widgets.Composite implements
@Override
public void dispose() {
-super.dispose();
if (images != null) {
for (Image each : images.values()) {
each.dispose();
}
}
+super.dispose();
}
public String getDataDirectory() {
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/EvaluationContentProvider.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/EvaluationContentProvider.java
index add5a50..c0a8b6e 100644
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/EvaluationContentProvider.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/EvaluationContentProvider.java
@@ -20,6 +20,7 @@
package org.apache.uima.ruta.testing.ui.views;
import org.apache.uima.ruta.caseditor.view.tree.AnnotationTreeNode;
+import org.apache.uima.ruta.caseditor.view.tree.FSFeatureTreeNode;
import org.apache.uima.ruta.caseditor.view.tree.ITreeNode;
import org.apache.uima.ruta.caseditor.view.tree.TypeTreeNode;
import org.apache.uima.ruta.testing.ui.views.tree.TestEvaluationTree;
@@ -59,6 +60,10 @@ public class EvaluationContentProvider implements
ITreeContentProvider {
AnnotationTreeNode node = (AnnotationTreeNode) parentElement;
return node.getChildren();
}
+if (parentElement instanceof FSFeatureTreeNode) {
+ FSFeatureTreeNode node = (FSFeatureTreeNode) parentElement;
+ return node.getChildren();
+}
return empty;
}
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta
[uima-ruta] branch UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views created (now 36b46fa)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 36b46fa UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views This branch includes the following new commits: new 36b46fa UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: Merge pull request #21 from apache/UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch main-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 6bac34fbcad3b92bd1bc70b0f5bb6033d5a45ba8 Merge: 087f507 36b46fa Author: pkluegl AuthorDate: Fri Dec 4 12:22:06 2020 +0100 Merge pull request #21 from apache/UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor… .../org/apache/uima/ruta/check/AnnotationCheckComposite.java | 10 +- .../apache/uima/ruta/explain/rulelist/RuleListViewPage.java| 2 +- .../java/org/apache/uima/ruta/query/ui/QueryComposite.java | 2 +- .../uima/ruta/testing/ui/views/EvaluationContentProvider.java | 5 + .../uima/ruta/testing/ui/views/EvaluationLabelProvider.java| 5 +++-- .../apache/uima/ruta/testing/ui/views/EvaluationViewPage.java | 6 +++--- .../java/org/apache/uima/ruta/testing/ui/views/InfoPanel.java | 2 +- .../org/apache/uima/ruta/testing/ui/views/TestViewPage.java| 1 + .../uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java | 5 - ruta-ep-engine/pom.xml | 2 +- 10 files changed, 25 insertions(+), 15 deletions(-)
[uima-ruta] branch main-v2 updated (087f507 -> 6bac34f)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main-v2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 087f507 [UIMA-6301] Rename "master" branches to "main" add 36b46fa UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views new 6bac34f Merge pull request #21 from apache/UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/check/AnnotationCheckComposite.java | 10 +- .../apache/uima/ruta/explain/rulelist/RuleListViewPage.java| 2 +- .../java/org/apache/uima/ruta/query/ui/QueryComposite.java | 2 +- .../uima/ruta/testing/ui/views/EvaluationContentProvider.java | 5 + .../uima/ruta/testing/ui/views/EvaluationLabelProvider.java| 5 +++-- .../apache/uima/ruta/testing/ui/views/EvaluationViewPage.java | 6 +++--- .../java/org/apache/uima/ruta/testing/ui/views/InfoPanel.java | 2 +- .../org/apache/uima/ruta/testing/ui/views/TestViewPage.java| 1 + .../uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java | 5 - ruta-ep-engine/pom.xml | 2 +- 10 files changed, 25 insertions(+), 15 deletions(-)
[uima-ruta] branch UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views updated (36b46fa -> 2e4cd1e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 36b46fa UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc add 7063210 no jira - remove test type system add b70cb79 no jira - avoid compile errors with workarounds add dbc9ccf no jira - uima v3 SNAPSHOT add 8773566 no jira - update to released uimaj v3 beta add 62a5374 no jira - update cover class add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version add 7702db9 no jira - update readme/notes add 35f4bd6 no jira - merge ruta v2 to ruta v3 add 9193a36 no jira - cleanup usage of commons-lang add 640be17 UIMA-6024: apply cleanup of 2.7.0 add 05a03e5 UIMA-6024: apply changes of v2 add 3841fec UIMA-6024: clean up add bc4c066 no jira- update urls, update versions add 5d0b0f8 no jira- update urls add 513abbe UIMA-5997: skip japicmp add 0c6acc1 UIMA-6093: update parent version add caa4e84 UIMA-6118: uima version add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1 add 1bec99e UIMA-6024: fixed merge errors add 0235ca2 UIMA-6024: clean up in failing test add 8a1da3f UIMA-6024: fixed test add 2a90a51 UIMA-6024: fixed generics add 27b4d9f UIMA-6024: manual merge with v2 add 59aa3b3 UIMA-4676: fixed imports broken by manual merge add 4c1175c no jira - fixed layout in docs add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3 add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check add c19a8f2 UIMA-6150: avoid using subiterators in filter add bbaf75e UIMA-6154: fixed move on check add faffea5 [maven-release-plugin] prepare release ruta-3.0.0 add 74a6825 [maven-release-plugin] prepare for next development iteration add e485640 no jira - manual rollback add 1183353 no jira - remove permgen mention add c281e2f no jira - update some example v2 versions, fixed some typos add 865129c no jira - fixed scm urls add 2801832 [maven-release-plugin] prepare release ruta-3.0.0 add f31f835 [maven-release-plugin] prepare for next development iteration add 3a208f6 no jira - manual rollback add acecd9e [maven-release-plugin] prepare release ruta-3.0.0 add e1631ed [maven-release-plugin] prepare for next development iteration add d7c7907 no jira - manual rollback add 74257dc [maven-release-plugin] prepare release ruta-3.0.0 add ed79ca4 [maven-release-plugin] prepare for next development iteration add 0d961d8 no jira - manual rollback add 6d06e5a no jira - fix eclispe update site link to v3 add 32de728 no jira - avoid problems in jenkins job add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0 add 7ac7501 [maven-release-plugin] prepare for next development iteration add 7417f02 no jira - manual rollback add dd29013 no jira fix jira version, improve readme/release-notes add 9dd61c8 no jira - improve release-notes add 1d7e2b2 no jira - improve release-notes add d69e99d [maven-release-plugin] prepare release ruta-3.0.0 add f24224c [maven-release-plugin] prepare for next development iteration add f2262f6 no jira - fix readme/release-notes according rc review add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes add 1d9cce9 no jira - update updatesite version add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1 add fdc9355 [maven-release-plugin] prepare for next development iteration add 7d8eeec no jira - manual rollback add 0fe2c34 UIMA-6194: merge v2 changes add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1 add 2c049ed [maven-release-plugin] prepare for next development iteration add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order add 22085e1
[uima-ruta] 01/01: Merge remote-tracking branch 'origin/main' into UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 2e4cd1eca029b5cee23260fa02239c2cb75a54c1 Merge: 36b46fa 630ec06 Author: Peter Klügl AuthorDate: Fri Dec 4 12:23:12 2020 +0100 Merge remote-tracking branch 'origin/main' into UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views # Conflicts: # ruta-parent/pom.xml README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 2 +- .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml| 2 +- pom.xml| 10 +- ruta-basic-type/pom.xml| 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 -- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 7 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++ .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java| 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 - .../apache/uima/ruta/rule/WildCardRuleElement.java | 32 ++- .../apache/uima/ruta/ReindexUpdateModeTest.java| 2 + .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++ .../uima/ruta/engine/MultipleSeedersTest.java | 100 - .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java| 7 +- ruta-ep-caseditor/.gitignore | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 2 +- ruta-ep-ide/pom.xml| 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml| 6 +- ruta-typesystem/pom.xml| 2 +- 51 files changed, 590 insertions(+), 577 deletions(-)
[uima-ruta] branch main updated (630ec06 -> 2e4cd1e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 630ec06 [UIMA-6301] Rename "master" branches to "main" add b2f2fc1 Merge pull request #18 from apache/UIMA-6271-validate-internal-ruta-indexing add 5f05845 UIMA-6271: Ruta: option to validate internal indexing in RutaEngine add 087f507 [UIMA-6301] Rename "master" branches to "main" add 36b46fa UIMA-6302: Ruta: error visualizing comparing annotation in CAS Editor views add 2e4cd1e Merge remote-tracking branch 'origin/main' into UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/check/AnnotationCheckComposite.java | 10 +- .../apache/uima/ruta/explain/rulelist/RuleListViewPage.java| 2 +- .../java/org/apache/uima/ruta/query/ui/QueryComposite.java | 2 +- .../uima/ruta/testing/ui/views/EvaluationContentProvider.java | 5 + .../uima/ruta/testing/ui/views/EvaluationLabelProvider.java| 5 +++-- .../apache/uima/ruta/testing/ui/views/EvaluationViewPage.java | 6 +++--- .../java/org/apache/uima/ruta/testing/ui/views/InfoPanel.java | 2 +- .../org/apache/uima/ruta/testing/ui/views/TestViewPage.java| 1 + .../uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java | 5 - ruta-ep-engine/pom.xml | 2 +- 10 files changed, 25 insertions(+), 15 deletions(-)
[uima-ruta] branch main-v2 updated: UIMA-6262: added test
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/main-v2 by this push:
new 1c569ed UIMA-6262: added test
1c569ed is described below
commit 1c569edbaac6deb646a0cfadfc6dcc6a1e0fbe83
Author: Peter Klügl
AuthorDate: Fri Dec 4 17:23:01 2020 +0100
UIMA-6262: added test
---
.../annotation/AnnotationLabelExpressionTest.java | 25 --
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
index e075e0b..1e5984e 100644
---
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
@@ -796,9 +796,30 @@ public class AnnotationLabelExpressionTest {
}
@Test
+ public void testComplexLabelReset() throws Exception {
+// UIMA-6262
+// Enumeration
+// <-{dc1:DiagnosisConcept{dc1.negatedBy!=null}; cue:dc1.negatedBy;}
+// ->{dc2:DiagnosisConcept{dc2.negatedBy==null -> dc2.negatedBy=cue};
+// };
+// solved by rewriting
+
+String document = "Test 1. Test 2. Test 3. Test 4.";
+
+String script = "";
+script += "ANY+{-PARTOF(T1),-PARTOF(PERIOD)-> T1};\n";
+script += "T1<-{n1:NUM{REGEXP(\"1|3\")};}<-{n2:n1;}\n"; // one applies
always
+script += "->{n2{->T2};};"; //
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "1", "3");
+ }
+
+ @Test
@Ignore
public void testInlineWithQuantifier() throws Exception {
-
+
String script = "";
script += "CW{-> Struct1, Struct1.a=sw} sw:SW;\n";
script += "sw:SW{-> Struct1, Struct1.a=sw};\n";
@@ -807,5 +828,5 @@ public class AnnotationLabelExpressionTest {
CAS cas = this.applyOnStruct4Cas(script);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text");
}
-
+
}
[uima-ruta] branch UIMA-6324-conjunction-disjunction-missed-matches created (now 7857452)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6324-conjunction-disjunction-missed-matches in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 7857452 UIMA-6324: | and & REs may miss matches This branch includes the following new commits: new 7857452 UIMA-6324: | and & REs may miss matches The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: UIMA-6324: | and & REs may miss matches
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
UIMA-6324-conjunction-disjunction-missed-matches
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 78574524949c75d8bb08eb5de0830a8f67625561
Author: Peter Klügl
AuthorDate: Tue Mar 9 18:07:11 2021 +0100
UIMA-6324: | and & REs may miss matches
- avoid overriding match linking: do not assign wrong element match to
previous rulematch
- set direction in conjunction match
---
.../apache/uima/ruta/rule/ComposedRuleElement.java | 14 +++--
.../uima/ruta/rule/ComposedRuleElementTest.java| 63 ++
2 files changed, 69 insertions(+), 8 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
index 8af7336..b5634a9 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
@@ -254,12 +254,12 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
continue;
}
ComposedRuleElementMatch startElementMatch =
(ComposedRuleElementMatch) eachStartRuleMatch
- .getLastMatch(this, true);
- List continueMatch = each.continueMatch(true, annotation,
eachStartRuleMatch,
+ .getLastMatch(this, after);
+ List continueMatch = each.continueMatch(after,
annotation, eachStartRuleMatch,
null, startElementMatch, null, this, stream, crowd);
for (RuleMatch startRuleMatch : continueMatch) {
ComposedRuleElementMatch elementMatch = (ComposedRuleElementMatch)
startRuleMatch
-.getLastMatch(this, true);
+.getLastMatch(this, after);
ruleMatches.put(startRuleMatch, elementMatch);
}
}
@@ -327,8 +327,7 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
Map ruleMatches, boolean
direction,
RutaStream stream) {
// TODO hotfix: this needs a correct implementation
-Map result = new TreeMap<>(
-ruleMatchComparator);
+Map result = new
TreeMap<>(ruleMatchComparator);
Set> entrySet =
ruleMatches.entrySet();
Entry largestEntry = null;
AnnotationFS largestAnnotation = null;
@@ -336,7 +335,7 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
RuleMatch ruleMatch = entry.getKey();
ComposedRuleElementMatch elementMatch = entry.getValue();
if (elementMatch.matched()) {
-result.put(ruleMatch, elementMatch);
+result.putIfAbsent(ruleMatch, elementMatch);
} else {
MatchContext context = new MatchContext(getFirstElement(), ruleMatch,
direction);
AnnotationFS lastMatchedAnnotation =
ruleMatch.getLastMatchedAnnotation(context, stream);
@@ -565,8 +564,7 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
RutaEnvironment environment = context.getParent().getEnvironment();
environment.addMatchToVariable(ruleMatch, this, context, stream);
-List evaluatedConditions = new ArrayList<>(
-conditions.size());
+List evaluatedConditions = new
ArrayList<>(conditions.size());
for (AbstractRutaCondition condition : conditions) {
crowd.beginVisit(condition, null);
EvaluatedCondition eval = condition.eval(context, stream, crowd);
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementTest.java
new file mode 100644
index 000..c0839fe
--- /dev/null
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.ruta.rule;
+
+import org.apache.uima.cas.CAS;
+import org.apache.uima.ruta.engine.Ruta;
+import org.apache.uima.ruta.engine.Rut
[uima-ruta] branch UIMA-6324-conjunction-disjunction-missed-matches updated (7857452 -> ea6b8d4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6324-conjunction-disjunction-missed-matches in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7857452 UIMA-6324: | and & REs may miss matches add ea6b8d4 UIMA-6324: | and & REs may miss matches No new revisions were added by this update. Summary of changes: .../apache/uima/ruta/rule/ComposedRuleElementTest.java | 16 1 file changed, 16 insertions(+)
[uima-ruta] branch UIMA-6319-TextSeeder-creates-MARKUP-annotations created (now e33acaf)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6319-TextSeeder-creates-MARKUP-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at e33acaf UIMA-6319: TextSeeder creates MARKUP annotations This branch includes the following new commits: new e33acaf UIMA-6319: TextSeeder creates MARKUP annotations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
