You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/03/18 18:34:47 UTC
[uima-ruta] branch main updated (9c3fc3e -> 71027f2)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from 9c3fc3e Merge pull request #26 from apache/feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
add e6d25f6 [UIMA-6341] Try out p2-layout-resolver
add b6808b2 [UIMA-6341] Try out p2-layout-resolver
add e9d1f13 [UIMA-6325] Update to UIMA Parent POM 14
add 362e23e Merge pull request #25 from apache/feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
add 7857452 UIMA-6324: | and & REs may miss matches
add ea6b8d4 UIMA-6324: | and & REs may miss matches
add df9d5e2 Merge pull request #27 from apache/UIMA-6324-conjunction-disjunction-missed-matches
add e33acaf UIMA-6319: TextSeeder creates MARKUP annotations
add 106483f UIMA-6319: TextSeeder creates MARKUP annotations
add 948ea97 Merge pull request #28 from apache/UIMA-6319-TextSeeder-creates-MARKUP-annotations
add ba0e010 UIMA-6332: Ruta: change seeders param default to TextSeeder
add 11c892d Merge pull request #30 from apache/UIMA-6332-Ruta-change-seeders-param-default-to-TextSeeder
add 023209d UIMA-6338: Ruta: Inconsistency Interpreter vs. Guide on VOTE
add 1ee0c7c UIMA-6338: Ruta: Inconsistency Interpreter vs. Guide on VOTE
add 3d5a7fd UIMA-6332: Ruta: change seeders param default to TextSeeder
add 0090921 Merge pull request #32 from apache/UIMA-6332-Ruta-change-seeders-param-default-to-TextSeeder-Part2
add 26f1daa no jira - adapt test
add bbf49d4 no jira - update version to upcoming release
add 720e80b Merge branch 'main-v2' into UIMA-6338-Inconsistency-Interpreter-vs-Guide-on-VOTE
add 6136997 UIMA-6340: Ruta: Condition AFTER does not respect BLOCK window
add 001f401 Merge branch 'main-v2' into UIMA-6340-Ruta-Condition-AFTER-does-not-respect-BLOCK-window
add 41b6c53 Merge pull request #34 from apache/UIMA-6340-Ruta-Condition-AFTER-does-not-respect-BLOCK-window
add 99f5394 Merge branch 'main-v2' into UIMA-6338-Inconsistency-Interpreter-vs-Guide-on-VOTE
add 0579683 Merge pull request #31 from apache/UIMA-6338-Inconsistency-Interpreter-vs-Guide-on-VOTE
add 8bdd112 [UIMA-6341] Try out p2-layout-resolver
add 41dd4b5 [UIMA-6341] Try out p2-layout-resolver
add 7e54f0a Merge commit '41dd4b51bd7a7c206f7dd9294eb3bf1d6acc3913' into feature/UIMA-6341-Try-out-p2-layout-resolver
add 7abd860 [UIMA-6341] Try out p2-layout-resolver
add e248e27 [UIMA-6341] Try out p2-layout-resolver
new 71027f2 Merge pull request #36 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver
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/pom.xml | 9 +-
.../uima/ruta/action/MarkTableReloadTest.java | 2 +
.../main/java/org/apache/uima/ruta/RutaStream.java | 6 +-
.../apache/uima/ruta/condition/AfterCondition.java | 28 ++-
.../uima/ruta/condition/BeforeCondition.java | 27 ++-
.../apache/uima/ruta/condition/VoteCondition.java | 20 +-
.../org/apache/uima/ruta/engine/RutaEngine.java | 2 +-
.../org/apache/uima/ruta/engine/RutaTestUtils.java | 15 ++
.../apache/uima/ruta/rule/ComposedRuleElement.java | 14 +-
.../org/apache/uima/ruta/seed/DefaultSeeder.java | 27 ++-
.../jflex/org/apache/uima/ruta/seed/SeedLexer.flex | 20 --
.../org/apache/uima/ruta/engine/BasicEngine.xml | 2 +-
.../org/apache/uima/ruta/WSDictionaryTest.java | 8 +-
.../apache/uima/ruta/action/AddFilterTypeTest.java | 10 +-
.../apache/uima/ruta/action/AddRetainTypeTest.java | 4 +-
.../apache/uima/ruta/action/FilterTypeTest.java | 10 +-
.../org/apache/uima/ruta/action/MarkTableTest.java | 40 ++--
.../uima/ruta/action/RemoveFilterTypeTest.java | 4 +-
.../uima/ruta/action/RemoveRetainTypeTest.java | 10 +-
.../org/apache/uima/ruta/action/ReplaceTest.java | 10 +-
.../apache/uima/ruta/action/RetainTypeTest.java | 12 +-
.../org/apache/uima/ruta/action/Shift1Test.java | 4 +-
.../org/apache/uima/ruta/action/Shift2Test.java | 35 ++--
.../java/org/apache/uima/ruta/action/TrimTest.java | 8 +-
.../org/apache/uima/ruta/condition/AfterTest.java | 39 +++-
.../org/apache/uima/ruta/condition/BeforeTest.java | 37 +++-
.../org/apache/uima/ruta/condition/VoteTest.java | 32 ++-
.../apache/uima/ruta/engine/RutaModifierTest.java | 32 ++-
.../uima/ruta/engine/TestRutaInferenceVisitor.java | 1 -
.../uima/ruta/rule/ComposedRuleElementTest.java | 79 ++++++++
.../uima/ruta/rule/LiteralStringMatchTest.java | 9 +-
.../apache/uima/ruta/seed/DefaultSeederTest.java | 58 +++---
.../org/apache/uima/ruta/seed/TextSeederTest.java | 80 ++++++++
.../org/apache/uima/ruta/TypeAliasTestEngine.xml | 2 +-
.../uima/ruta/action/ConfigureTestEngine.xml | 2 +-
.../org/apache/uima/ruta/action/Shift2Test.ruta | 9 -
.../org/apache/uima/ruta/action/Shift2Test.txt | 1 -
.../org/apache/uima/ruta/engine/CWEngine.xml | 2 +-
.../uima/ruta/engine/RecursiveConfigureEngine.xml | 2 +-
.../org/apache/uima/ruta/engine/SWEngine.xml | 2 +-
.../org/apache/uima/ruta/engine/SimpleEngine.xml | 2 +-
ruta-docbook/src/docbook/tools.ruta.overview.xml | 4 +-
ruta-eclipse-update-site/pom.xml | 18 +-
ruta-ep-addons/pom.xml | 56 +++---
.../uima/ruta/cde/ui/ConstraintSelectView.java | 9 +-
.../org/apache/uima/ruta/cde/ui/DocumentView.java | 12 ++
.../org/apache/uima/ruta/cde/ui/ResultView.java | 9 +-
.../uima/ruta/check/AnnotationCheckView.java | 6 +
.../apache/uima/ruta/explain/apply/ApplyView.java | 6 +
.../uima/ruta/explain/createdBy/CreatedByView.java | 8 +-
.../uima/ruta/explain/element/ElementView.java | 7 +
.../uima/ruta/explain/failed/FailedView.java | 7 +
.../uima/ruta/explain/inlined/InlinedView.java | 6 +
.../uima/ruta/explain/matched/MatchedView.java | 6 +
.../uima/ruta/explain/rulelist/RuleListView.java | 7 +
.../explain/selection/ExplainSelectionView.java | 7 +
.../org/apache/uima/ruta/query/ui/QueryView.java | 15 +-
.../uima/ruta/statistics/StatisticsView.java | 8 +-
.../ruta/testing/ui/views/TestPageBookView.java | 7 +-
.../testing/ui/views/fn/FalseNegativeView.java | 8 +-
.../testing/ui/views/fp/FalsePositiveView.java | 8 +-
.../ruta/testing/ui/views/tp/TruePositiveView.java | 8 +-
ruta-ep-caseditor/pom.xml | 52 ++---
.../uima/ruta/caseditor/RutaCasEditorPlugin.java | 3 +-
.../view/browser/AnnotationBrowserView.java | 7 +-
.../uima/ruta/caseditor/view/html/HtmlView.java | 44 ++--
.../caseditor/view/selection/SelectionView.java | 8 +-
.../caseditor/view/tree/ArrayFeatureTreeNode.java | 1 -
.../uima/ruta/caseditor/view/tree/FSTreeNode.java | 1 -
.../view/tree/PrimitiveFeatureTreeNode.java | 2 -
.../caseditor/view/tree/PrimitiveTreeNode.java | 1 -
.../view/tree/TypeOrderedRootTreeNode.java | 1 -
.../ruta/caseditor/view/tree/TypeTreeNode.java | 1 -
ruta-ep-core-ext/pom.xml | 8 +-
ruta-ep-ide-ui/pom.xml | 171 ++++++++--------
ruta-ep-ide/pom.xml | 60 +++---
ruta-ep-parent/pom.xml | 222 +++++++++------------
ruta-ep-textruler/pom.xml | 44 ++--
ruta-parent/pom.xml | 18 +-
79 files changed, 945 insertions(+), 637 deletions(-)
create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementTest.java
create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/seed/TextSeederTest.java
delete mode 100644 ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta
delete mode 100644 ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.txt
[uima-ruta] 01/01: Merge pull request #36 from
apache/feature/UIMA-6341-Try-out-p2-layout-resolver
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 71027f2d1326fc8bc3d4517b227dde3bbeb7946d
Merge: 9c3fc3e e248e27
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Mar 18 19:34:05 2021 +0100
Merge pull request #36 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver
[UIMA-6341] Try out p2 layout resolver
.../ruta-ep-example-extensions/pom.xml | 9 +-
.../uima/ruta/action/MarkTableReloadTest.java | 2 +
.../main/java/org/apache/uima/ruta/RutaStream.java | 6 +-
.../apache/uima/ruta/condition/AfterCondition.java | 28 ++-
.../uima/ruta/condition/BeforeCondition.java | 27 ++-
.../apache/uima/ruta/condition/VoteCondition.java | 20 +-
.../org/apache/uima/ruta/engine/RutaEngine.java | 2 +-
.../org/apache/uima/ruta/engine/RutaTestUtils.java | 15 ++
.../apache/uima/ruta/rule/ComposedRuleElement.java | 14 +-
.../org/apache/uima/ruta/seed/DefaultSeeder.java | 27 ++-
.../jflex/org/apache/uima/ruta/seed/SeedLexer.flex | 20 --
.../org/apache/uima/ruta/engine/BasicEngine.xml | 2 +-
.../org/apache/uima/ruta/WSDictionaryTest.java | 8 +-
.../apache/uima/ruta/action/AddFilterTypeTest.java | 10 +-
.../apache/uima/ruta/action/AddRetainTypeTest.java | 4 +-
.../apache/uima/ruta/action/FilterTypeTest.java | 10 +-
.../org/apache/uima/ruta/action/MarkTableTest.java | 40 ++--
.../uima/ruta/action/RemoveFilterTypeTest.java | 4 +-
.../uima/ruta/action/RemoveRetainTypeTest.java | 10 +-
.../org/apache/uima/ruta/action/ReplaceTest.java | 10 +-
.../apache/uima/ruta/action/RetainTypeTest.java | 12 +-
.../org/apache/uima/ruta/action/Shift1Test.java | 4 +-
.../org/apache/uima/ruta/action/Shift2Test.java | 35 ++--
.../java/org/apache/uima/ruta/action/TrimTest.java | 8 +-
.../org/apache/uima/ruta/condition/AfterTest.java | 39 +++-
.../org/apache/uima/ruta/condition/BeforeTest.java | 37 +++-
.../org/apache/uima/ruta/condition/VoteTest.java | 32 ++-
.../apache/uima/ruta/engine/RutaModifierTest.java | 32 ++-
.../uima/ruta/engine/TestRutaInferenceVisitor.java | 1 -
.../uima/ruta/rule/ComposedRuleElementTest.java | 79 ++++++++
.../uima/ruta/rule/LiteralStringMatchTest.java | 9 +-
.../apache/uima/ruta/seed/DefaultSeederTest.java | 58 +++---
.../org/apache/uima/ruta/seed/TextSeederTest.java | 80 ++++++++
.../org/apache/uima/ruta/TypeAliasTestEngine.xml | 2 +-
.../uima/ruta/action/ConfigureTestEngine.xml | 2 +-
.../org/apache/uima/ruta/action/Shift2Test.ruta | 9 -
.../org/apache/uima/ruta/action/Shift2Test.txt | 1 -
.../org/apache/uima/ruta/engine/CWEngine.xml | 2 +-
.../uima/ruta/engine/RecursiveConfigureEngine.xml | 2 +-
.../org/apache/uima/ruta/engine/SWEngine.xml | 2 +-
.../org/apache/uima/ruta/engine/SimpleEngine.xml | 2 +-
ruta-docbook/src/docbook/tools.ruta.overview.xml | 4 +-
ruta-eclipse-update-site/pom.xml | 18 +-
ruta-ep-addons/pom.xml | 56 +++---
.../uima/ruta/cde/ui/ConstraintSelectView.java | 9 +-
.../org/apache/uima/ruta/cde/ui/DocumentView.java | 12 ++
.../org/apache/uima/ruta/cde/ui/ResultView.java | 9 +-
.../uima/ruta/check/AnnotationCheckView.java | 6 +
.../apache/uima/ruta/explain/apply/ApplyView.java | 6 +
.../uima/ruta/explain/createdBy/CreatedByView.java | 8 +-
.../uima/ruta/explain/element/ElementView.java | 7 +
.../uima/ruta/explain/failed/FailedView.java | 7 +
.../uima/ruta/explain/inlined/InlinedView.java | 6 +
.../uima/ruta/explain/matched/MatchedView.java | 6 +
.../uima/ruta/explain/rulelist/RuleListView.java | 7 +
.../explain/selection/ExplainSelectionView.java | 7 +
.../org/apache/uima/ruta/query/ui/QueryView.java | 15 +-
.../uima/ruta/statistics/StatisticsView.java | 8 +-
.../ruta/testing/ui/views/TestPageBookView.java | 7 +-
.../testing/ui/views/fn/FalseNegativeView.java | 8 +-
.../testing/ui/views/fp/FalsePositiveView.java | 8 +-
.../ruta/testing/ui/views/tp/TruePositiveView.java | 8 +-
ruta-ep-caseditor/pom.xml | 52 ++---
.../uima/ruta/caseditor/RutaCasEditorPlugin.java | 3 +-
.../view/browser/AnnotationBrowserView.java | 7 +-
.../uima/ruta/caseditor/view/html/HtmlView.java | 44 ++--
.../caseditor/view/selection/SelectionView.java | 8 +-
.../caseditor/view/tree/ArrayFeatureTreeNode.java | 1 -
.../uima/ruta/caseditor/view/tree/FSTreeNode.java | 1 -
.../view/tree/PrimitiveFeatureTreeNode.java | 2 -
.../caseditor/view/tree/PrimitiveTreeNode.java | 1 -
.../view/tree/TypeOrderedRootTreeNode.java | 1 -
.../ruta/caseditor/view/tree/TypeTreeNode.java | 1 -
ruta-ep-core-ext/pom.xml | 8 +-
ruta-ep-ide-ui/pom.xml | 171 ++++++++--------
ruta-ep-ide/pom.xml | 60 +++---
ruta-ep-parent/pom.xml | 222 +++++++++------------
ruta-ep-textruler/pom.xml | 44 ++--
ruta-parent/pom.xml | 18 +-
79 files changed, 945 insertions(+), 637 deletions(-)