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 2020/11/02 20:39:56 UTC
[uima-uimaj] branch
UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS updated
(0797fa5 -> 5b8774c)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from 0797fa5 [UIMA-6151] Containment/overlap predicates for AnnotationFS
add bbec5c4 [UIMA-3484] Fix JavaDoc issues
add 5b1c416 [UIMA-3484] Fix JavaDoc issues
add 876eabd [UIMA-3484] Fix JavaDoc issues
add b85d9a1 Merge branch 'master-v2' into UIMA-3484-Fix-JavaDoc
add 05e83e8 Merge pull request #46 from apache/UIMA-6243-JCas-returns-Annotation-when-asked-for-a-specific-subtype
add b36ee0d Merge branch 'master-v2' into UIMA-3484-Fix-JavaDoc
add b7d0a36 [UIMA-3484] Fix JavaDoc issues
add d7b5690 Merge branch 'master' into UIMA-3484-Fix-JavaDoc-v3
add 8f8e93c [UIMA-3484] Fix JavaDoc issues
add 3a7b3a0 [UIMA-3484] Fix JavaDoc issues
add 90762f6 [UIMA-3484] Fix JavaDoc issues
add 2fafcdc [UIMA-3484] Fix JavaDoc issues
add 2244a2f [UIMA-6269] select.coveredBy with includeAnnotationsWithEndBeyondBounds has broken edge case
add 979c83b [UIMA-6269] select.coveredBy with includeAnnotationsWithEndBeyondBounds has broken edge case
add 225f1ec Merge pull request #61 from apache/UIMA-6269-select-coveredBy-broken-on-edge-case
add 303e645 Merge branch 'master' into UIMA-3484-Fix-JavaDoc-v3
add 4d909cb [UIMA-3484] Fix JavaDoc issues
add f48d3d1 Merge commit '4d909cb39a7d7192d0bdb9113334ff44bf8fcf49' into UIMA-3484-Fix-JavaDoc-v3
add dd28cfe Merge pull request #63 from apache/UIMA-3484-Fix-JavaDoc-v3
add 995b052 [UIMA-6272] UIMA doesn't build on Java 14
add 99d272e Merge pull request #64 from apache/UIMA-6272-UIMA-does-not-build-on-Java-14
add aa003d9 [UIMA-6274] Setting feature on builtin JCas cover class that was loaded before initializing TypeSystemImpl fails
add aa4c0cf [UIMA-6274] Setting feature on builtin JCas cover class that was loaded before initializing TypeSystemImpl fails
add b264ace Clearing isBeforeV3 flag in BinaryCasSerDes clear method, otherwise this flag would remain its intial value when the CAS is recycled, which caused deserialization issues in sessions where mixed v2 and v3 CAS'es were loaded.
add 93df336 Initialising the isBeforeV3 flag later in the reinit method of BinaryCasSerDes, since it could be reset to false when the delta flag is false, and this can cause failures during loading of earlier CAS versions than v3. The isBeforeV3 flag is not accessed before deserializeAfterVersion is invoked, and this only occurs inside this reinit method, so this additional change should not cause any unwanted side effects.
add a141ae7 [UIMA-6273] isBeforeV3 variable not reset in BinaryCasSerDes
add e07f234 Merge pull request #55 from apache/UIMA-3484-Fix-JavaDoc
add cb9894a [UIMA-6272] UIMA doesn't build on Java 14
add febf894 Merge pull request #65 from apache/UIMA-6272-UIMA-does-not-build-on-Java-14
add c6f0e3c [NO JIRA] Do not build on ASF Windows nodes - there seems to be a problem with the "nohup" command not being found - no idea why
add 0f00df8 Merge pull request #68 from apache/NO-Jira-Disable-build-on-ASF-Linux-nodes
add 72f3f7a NO JIRA - Fix build step printing environment variables on Windows
add 947e9b6 NO JIRA - Fix build step printing environment variables on Windows
add 978e525 Merge branch 'master' into NO-JIRA-Fix-build-on-Windows-nodes-master
add b4738b4 Merge pull request #70 from apache/NO-JIRA-Fix-build-on-Windows-nodes-master
add 6acfd94 Merge branch 'master' into UIMA-6273-isBeforeV3-variable-not-reset-in-BinaryCasSerDes
add f059176 Merge pull request #66 from mjunsilo/UIMA-6273-isBeforeV3-variable-not-reset-in-BinaryCasSerDes
add dc80b4b Merge branch 'master' into bugfix/UIMA-6274-Setting-feature-on-builtin-JCas-cover-class-that-was-loaded-before-initializing-TypeSystemImpl-fails
add 308dad4 Merge pull request #67 from apache/bugfix/UIMA-6274-Setting-feature-on-builtin-JCas-cover-class-that-was-loaded-before-initializing-TypeSystemImpl-fails
add 08b17c1 [UIMA-6273] isBeforeV3 variable not reset in BinaryCasSerDes
add d27bb44 Merge pull request #74 from apache/bugfix/UIMA-6273-isBeforeV3-variable-not-reset-in-BinaryCasSerDes
add a86f597 [NO JIRA] Fix JavaDoc and exclude .factorypath Eclipse configuration file from rat check
add 9ca3f7e Merge pull request #75 from apache/bugfix/NO-JIRA-Fix-JavaDoc-and-exclude-factorypath-from-rat-check
add 8723c73 [UIMA-6282] select.at() may fail to respect bounds
add da1d449 Merge pull request #72 from apache/bugfix/UIMA-6282-select.at-may-fail-to-respect-bounds
add 8d4718f [UIMA-6285] select.following() on a zero-width annotation returns other zero-width annotation at same location
add 9cb892a UIMA-6284: select.following() fails to find adjacent annotations
add c976921 UIMA-6284: select.following() fails to find adjacent annotations
add 4a17a35 Merge pull request #76 from apache/bugfix/UIMA-6284-select.following-fails-to-find-adjacent-annotations
add 6d0aa68 Merge branch 'master' into bugfix/UIMA-6285-select.following-on-a-zero-width-annotation-returns-other-zero-width-annotation-at-same-location
add e532727 Merge pull request #77 from apache/bugfix/UIMA-6285-select.following-on-a-zero-width-annotation-returns-other-zero-width-annotation-at-same-location
add 89c53d1 [UIMA-6286] select following finds zero-width annotation at reference end position
add 0a72e9f [UIMA-6286] select following finds zero-width annotation at reference end position
add aad00dc [UIMA-6286] select following finds zero-width annotation at reference end position
add 73f216f Merge pull request #78 from apache/bugfix/UIMA-6286-select-following-finds-zero-width-annotation-at-reference-end-position
add c181642 [UIMA-6287] FSArray.spliterator() fails to handle PEAR case
add 6ca1699 [UIMA-6287] FSArray.spliterator() fails to handle PEAR case
add cae7037 Merge pull request #79 from apache/bugfix/UIMA-6287-FSArray.spliterator-fails-to-handle-PEAR-case
add 5b8774c Merge branch 'master' into UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 28 +-
.../org/apache/vinci/transport/BaseClient.java | 4 +-
.../org/apache/vinci/transport/VinciServer.java | 1 -
.../vinci/VinciAnalysisEngineServiceStub.java | 18 +-
.../vinci/VinciAnalysisEngineService_impl.java | 5 +-
uimaj-core/pom.xml | 14 +-
.../uima/analysis_engine/AnalysisProcessData.java | 2 -
.../impl/AnalysisEngineImplBase.java | 3 -
.../impl/AnnotatorContext_impl.java | 7 +-
.../impl/UimacppAnalysisEngineImpl.java | 4 -
.../src/main/java/org/apache/uima/cas/FSIndex.java | 3 +-
.../main/java/org/apache/uima/cas/SelectFSs.java | 23 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes.java | 15 +-
.../java/org/apache/uima/cas/impl/CASImpl.java | 14 +-
.../org/apache/uima/cas/impl/FSClassRegistry.java | 4 +-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 48 ++-
.../java/org/apache/uima/cas/impl/Subiterator.java | 29 +-
.../java/org/apache/uima/cas/impl/TypeImpl.java | 4 +-
.../org/apache/uima/cas/impl/TypeSystemImpl.java | 54 ++-
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 14 +-
.../uima/cas_data/impl/FeatureStructureImpl.java | 5 -
.../uima/collection/CollectionReader_ImplBase.java | 5 +-
.../java/org/apache/uima/impl/SofaID_impl.java | 2 -
.../uima/internal/util/EncodedPrintStream.java | 2 +-
.../src/main/java/org/apache/uima/jcas/JCas.java | 2 +
.../org/apache/uima/jcas/cas/AnnotationBase.java | 2 +-
.../java/org/apache/uima/jcas/cas/FSArray.java | 16 +-
.../java/org/apache/uima/jcas/cas/FSArrayList.java | 2 +-
.../java/org/apache/uima/jcas/cas/FSHashSet.java | 2 +-
.../main/java/org/apache/uima/jcas/cas/Int2FS.java | 4 +-
.../org/apache/uima/jcas/cas/IntegerArrayList.java | 2 +-
.../org/apache/uima/jcas/cas/NonEmptyFSList.java | 4 +-
.../apache/uima/jcas/cas/NonEmptyFloatList.java | 4 +-
.../apache/uima/jcas/cas/NonEmptyIntegerList.java | 4 +-
.../apache/uima/jcas/cas/NonEmptyStringList.java | 4 +-
.../main/java/org/apache/uima/jcas/cas/Sofa.java | 12 +-
.../java/org/apache/uima/jcas/tcas/Annotation.java | 3 +-
.../impl/ResourceManagerConfiguration_impl.java | 6 +-
.../org/apache/uima/util/impl/XMLParser_impl.java | 32 +-
.../impl/ResultSpecWithTypeSystemTest.java | 2 -
.../uima/cas/impl/CasTypeSystemMapperTst.java | 1 -
.../org/apache/uima/cas/impl/SelectFsTest.java | 279 ++++++++++++++-
.../uima/cas/impl/UimaV2CasCompatibilityTest.java | 140 ++++++++
.../apache/uima/cas/test/JCasClassLoaderTest.java | 304 ++++++++++++++---
.../uima/jcas/impl/JCasCoverClassLoadingTest.java | 48 +++
.../test/resources/uima-v2-serialized-cas/README | 1 +
.../uima-v2-serialized-cas/simpleCas.bins | Bin 0 -> 6759 bytes
.../uima-v2-serialized-cas/simpleCas.bins0 | Bin 0 -> 12416 bytes
.../uima-v2-serialized-cas/simpleCas.bins4 | Bin 0 -> 2839 bytes
.../uima-v2-serialized-cas/simpleCas.bins6 | Bin 0 -> 2839 bytes
.../uima-v2-serialized-cas/simpleCas.bins6p | Bin 0 -> 9507 bytes
.../uima-v2-serialized-cas/simpleCas.bins6pTs | Bin 0 -> 8873 bytes
.../uima-v2-serialized-cas/simpleCas.binsp | Bin 0 -> 13536 bytes
.../uima-v2-serialized-cas/simpleCas.xcas | 20 ++
.../simpleCas.xmi | 96 ++----
.../test/resources/uima-v3-serialized-cas/README | 1 +
.../uima-v3-serialized-cas/simpleCas.bins | Bin 0 -> 6759 bytes
.../uima-v3-serialized-cas/simpleCas.bins0 | Bin 0 -> 12416 bytes
.../uima-v3-serialized-cas/simpleCas.bins4 | Bin 0 -> 2843 bytes
.../uima-v3-serialized-cas/simpleCas.bins6 | Bin 0 -> 2843 bytes
.../uima-v3-serialized-cas/simpleCas.bins6p | Bin 0 -> 9499 bytes
.../uima-v3-serialized-cas/simpleCas.bins6pTs | Bin 0 -> 8865 bytes
.../uima-v3-serialized-cas/simpleCas.binsp | Bin 0 -> 13524 bytes
.../uima-v3-serialized-cas/simpleCas.xcas | 20 ++
.../resources/uima-v3-serialized-cas/simpleCas.xmi | 1 +
.../uima/collection/impl/cpm/BaseCPMImpl.java | 23 +-
.../cpm/container/ProcessingContainer_Impl.java | 14 +-
.../uima/collection/impl/cpm/engine/CPMEngine.java | 47 ++-
.../collection/impl/cpm/engine/ProcessingUnit.java | 3 +-
.../uima/collection/impl/cpm/vinci/Vinci.java | 7 +-
.../impl/metadata/cpe/CasProcessorCpeObject.java | 7 +-
.../impl/metadata/cpe/CpeCheckpointImpl.java | 14 +-
.../cpe/CpeCollectionReaderCasInitializerImpl.java | 5 +-
.../impl/metadata/cpe/CpeDescriptionImpl.java | 5 +-
.../java/org/apache/uima/cas/impl/CasTestUtil.java | 4 -
.../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 8 +-
.../impl/cpm/CpmCasConsumer_ErrorTest.java | 4 +-
.../uima/caseditor/ide/CasEditorIdePlugin.java | 5 +-
.../ide/TypeSystemLocationPropertyPage.java | 26 +-
.../uima/taeconfigurator/InternalErrorCDE.java | 1 -
.../taeconfigurator/TAEConfiguratorPlugin.java | 3 +-
.../taeconfigurator/editors/MultiPageEditor.java | 343 +++++++++++--------
.../editors/MultiPageEditorContributor.java | 24 +-
.../editors/ui/AbstractSection.java | 377 +++++++++++++--------
.../editors/ui/AbstractSectionParm.java | 194 ++++++-----
.../taeconfigurator/editors/ui/FlowSection.java | 57 ++--
.../taeconfigurator/editors/ui/HeaderPage.java | 23 +-
.../editors/ui/HeaderPageWithSash.java | 3 -
.../uima/taeconfigurator/editors/ui/Utility.java | 63 ++--
.../ui/dialogs/AbstractDialogKeyVerify.java | 1 -
.../dialogs/AbstractDialogKeyVerifyJavaNames.java | 14 +-
.../editors/ui/dialogs/AddFeatureDialog.java | 16 +-
.../editors/ui/dialogs/AddIndexDialog.java | 21 +-
.../editors/ui/dialogs/AddSofaDialog.java | 35 +-
.../editors/ui/dialogs/FindComponentDialog.java | 6 +-
.../editors/ui/dialogs/PickTaeForTypesDialog.java | 16 +-
.../editors/ui/dialogs/SelectTypeDialog.java | 8 +-
.../apache/uima/ep_launcher/LauncherPlugin.java | 17 +-
.../java/org/apache/uima/pear/PearException.java | 12 +-
.../actions/PearProjectCustomizationException.java | 13 +-
.../uima/pear/generate/GeneratePearWizard.java | 12 +-
.../edit/EditInstallationDescriptorWizard.java | 12 +-
.../uima/pear/insd/edit/INSDComponentPage.java | 45 +--
.../edit/vars/AbstractVarValViewerHandler.java | 12 +-
.../apache/uima/pear/insd/edit/vars/VarVal.java | 6 +-
.../uima/pear/insd/edit/vars/VarValList.java | 28 +-
uimaj-examples/pom.xml | 1 +
.../org/apache/uima/examples/cpe/SimpleRunCPE.java | 19 +-
.../examples/flow/AdvancedFixedFlowController.java | 38 ++-
.../uima/examples/xmi/Ecore2UimaTypeSystem.java | 10 +-
uimaj-parent/pom.xml | 1 +
.../src/main/java/org/apache/uima/tools/RunAE.java | 1 -
.../uima/tools/cvd/tsview/FeatureTableModel.java | 4 -
.../uima/tools/docanalyzer/DocumentAnalyzer.java | 19 +-
.../apache/uima/tools/stylemap/StyleMapEditor.java | 44 ++-
.../org/apache/uima/tutorial/DateAnnot_Type.java | 9 +-
.../apache/uima/tutorial/DateTimeAnnot_Type.java | 19 +-
.../org/apache/uima/tutorial/Meeting_Type.java | 49 ++-
.../org/apache/uima/tutorial/RoomNumber_Type.java | 19 +-
.../apache/uima/tutorial/SentenceAnnot_Type.java | 9 +-
.../org/apache/uima/tutorial/TimeAnnot_Type.java | 9 +-
.../org/apache/uima/tutorial/UimaAcronym_Type.java | 19 +-
.../org/apache/uima/tutorial/UimaMeeting_Type.java | 9 +-
.../org/apache/uima/tutorial/WordAnnot_Type.java | 9 +-
124 files changed, 2167 insertions(+), 975 deletions(-)
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/UimaV2CasCompatibilityTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasCoverClassLoadingTest.java
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/README
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins0
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins4
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6p
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.bins6pTs
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.binsp
create mode 100644 uimaj-core/src/test/resources/uima-v2-serialized-cas/simpleCas.xcas
copy uimaj-core/src/test/resources/{ExampleCas => uima-v2-serialized-cas}/simpleCas.xmi (70%)
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/README
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins0
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins4
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6p
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.bins6pTs
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.binsp
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.xcas
create mode 100644 uimaj-core/src/test/resources/uima-v3-serialized-cas/simpleCas.xmi