This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from e204198 Merge branch 'main' into
feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
add b4de8d1 Merge pull request #152 from
apache/bugfix/UIMA-6390-NPE-when-trying-to-access-config-names-of-fresh-context
add b5d1df5 [UIMA-6393]: Circular imports break resource manager cache
add d9e7c20 [UIMA-6393]: Circular imports break resource manager cache
add 48f0526 [UIMA-6393]: Circular imports break resource manager cache PK
add 1e38ecb [UIMA-6393]: Circular imports break resource manager cache PK
add 74ae2b3 [UIMA-6393]: Circular imports break resource manager cache PK
add 767c530 [UIMA-6393]: Circular imports break resource manager cache PK
add 88e6585 [UIMA-6393]: Circular imports break resource manager cache PK
add 3a28d06 [UIMA-6393]: Circular imports break resource manager cache PK
add 55d48a8 [UIMA-6393]: Circular imports break resource manager cache PK
add d52d67e No issue. Add IntelliJ files to gitignore.
add 95fba68 [UIMA-6393]: Circular imports break resource manager cache
add aff5ac2 [UIMA-6393]: Circular imports break resource manager cache
add 0c1be38 [UIMA-6393]: Circular imports break resource manager cache
add b5c8d0a [UIMA-6393]: Circular imports break resource manager cache
add 4dfcf48 [UIMA-6393]: Circular imports break resource manager cache
add 2423a71 [UIMA-6393]: Circular imports break resource manager cache
add fe190c9 [UIMA-6393]: Circular imports break resource manager cache
add 05fcd03 [UIMA-6393]: Circular imports break resource manager cache
add 989b4fc [UIMA-6393]: Circular imports break resource manager cache
add 9770862 [UIMA-6393]: Circular imports break resource manager cache
add ed357df [UIMA-6393]: Circular imports break resource manager cache
add d17ec67 [UIMA-6393]: Circular imports break resource manager cache
add 634272b [UIMA-6393]: Circular imports break resource manager cache
add b484e7c [UIMA-6393]: Circular imports break resource manager cache
add 3f2e3b5 [UIMA-6393]: Circular imports break resource manager cache
add c93c055 [UIMA-6393]: Circular imports break resource manager cache
add 5d3cc35 [UIMA-6393]: Circular imports break resource manager cache
add 7b552b5 Merge pull request #154 from
apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
add e050dfa [UIMA-6398] Classloader paradoxon and memory leak in UIMA
loggers
add 8ede6d4 [UIMA-6400] UimaContextHolder threadlocal can leak
add 9d5fb49 Merge branch 'main' into
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
add 6859eec Merge pull request #155 from
apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
add 9aac775 Fixed v3 update site url
add 2e58b90 Merge pull request #156 from mych4nge/v3-update-site-url-fix
add 783bbfc [UIMA-6374] Create CAS (de)serialization test suite
add 6fa03e8 Merge pull request #157 from
apache/feature/UIMA-6374-Create-CAS-deserialization-test-suite
add dfb081c [UIMA-6397] Remove unnecessary code from Class_TCCL.java
add 2e80688 Merge branch 'main' into
bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers
add c33c8dd [UIMA-6398] Classloader paradoxon and memory leak in UIMA
loggers
add 89462e1 [UIMA-6374] Create CAS (de)serialization test suite (#160)
add 348cbfe Merge branch 'main' into
bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers
add 5cf965f Merge pull request #159 from
apache/bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers
add a9afc49 Merge branch 'main' into
bugfix/UIMA-6400-UimaContextHolder-threadlocal-can-leak
add b24559c Merge pull request #164 from
apache/bugfix/UIMA-6400-UimaContextHolder-threadlocal-can-leak
add 73e0cd2 [UIMA-6401] CPE ThreadGroupDestroyer keeps unnecessary
reference on CPMEngine
add f8d6999 Merge branch 'main' into
bugfix/UIMA-6401-CPE-ThreadGroupDestroyer-keeps-unnecessary-reference-on-CPMEngine
add 22d6a90 Merge pull request #163 from
apache/bugfix/UIMA-6401-CPE-ThreadGroupDestroyer-keeps-unnecessary-reference-on-CPMEngine
add 130a5d8 Merge branch 'main' into
feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
No new revisions were added by this update.
Summary of changes:
.../src/docbook/eclipse_setup.xml | 2 +-
.../src/docbook/ref.xml.component_descriptor.xml | 10 +
.../java/org/apache/uima/UimaContextHolder.java | 107 +-
.../asb/impl/FlowControllerContainer.java | 1 -
.../impl/PrimitiveAnalysisEngine_impl.java | 20 +-
.../org/apache/uima/internal/util/Class_TCCL.java | 5 -
.../apache/uima/resource/Resource_ImplBase.java | 4 +-
.../uima/resource/impl/ResourceManager_impl.java | 16 +
.../uima/resource/metadata/FsIndexCollection.java | 3 +
.../uima/resource/metadata/TypePriorities.java | 3 +
.../resource/metadata/TypeSystemDescription.java | 3 +
.../FsIndexCollectionImportResolverAdapter.java | 79 +
.../metadata/impl/FsIndexCollection_impl.java | 106 +-
.../resource/metadata/impl/ImportResolver.java | 284 +++
.../impl/TypePrioritiesImportResolverAdapter.java | 79 +
.../metadata/impl/TypePriorities_impl.java | 105 +-
...TypeSystemDescriptionImportResolverAdapter.java | 78 +
.../metadata/impl/TypeSystemDescription_impl.java | 100 +-
.../src/main/java/org/apache/uima/util/Logger.java | 11 +
.../apache/uima/util/impl/Logger_common_impl.java | 2585 ++++++++++----------
.../impl/AnalysisEngineDescription_implTest.java | 1 -
...asSerializationDeserialization_BINARY_Test.java | 3 +-
...serialization_COMPRESSED_FILTERED_TSI_Test.java | 8 +-
.../CasSerializationDeserialization_XCAS_Test.java | 5 +-
...izationDeserialization_XMI_1_0_PRETTY_Test.java | 5 +-
...izationDeserialization_XMI_1_1_PRETTY_Test.java | 5 +-
.../uima/cas/serdes/CasToComparableText.java | 99 +-
.../uima/cas/serdes/SerDesCasIOTestUtils.java | 38 +-
.../ProgrammaticallyCreatedCasDataSuite.java | 111 +
.../generators/MultiFeatureRandomCasGenerator.java | 44 +
.../org/apache/uima/impl/UimaContext_implTest.java | 1 -
.../resource/metadata/impl/ImportResolverTest.java | 528 ++++
.../impl/TypeSystemDescription_implTest.java | 129 +-
.../ser-ref/casWithFsList/cas.bin | Bin 0 -> 3204 bytes
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/cas.bin | Bin 0 -> 708 bytes
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/typesystem.xml | 117 +
.../ser-ref/casWithFsList/cas.bin | Bin 0 -> 2868 bytes
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/typesystem.xml | 117 +
.../ser-ref/casWithFsList/cas.bin | Bin 0 -> 3603 bytes
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/cas.xcas | 47 +
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/typesystem.xml | 117 +
.../ser-ref/casWithFsList/data.xmi | 38 +
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/typesystem.xml | 117 +
.../ser-ref/casWithFsList/data.xmi | 38 +
.../ser-ref/casWithFsList/debug-typesystem.xml | 117 +
.../ser-ref/casWithFsList/debug.xmi | 38 +
.../ser-ref/casWithFsList/typesystem.xml | 117 +
.../Loop-with-2-nodes-1.xml} | 73 +-
.../Loop-with-2-nodes-2.xml} | 73 +-
.../Loop-with-3-nodes-1.xml} | 73 +-
.../Loop-with-3-nodes-2.xml} | 73 +-
.../Loop-with-3-nodes-3.xml} | 73 +-
.../SelfImport.xml} | 73 +-
.../Transitive-with-3-nodes-1.xml} | 73 +-
.../Transitive-with-3-nodes-2.xml} | 73 +-
.../Transitive-with-3-nodes-3.xml} | 72 +-
.../complexImportScenario1/tsd0.xml} | 81 +-
.../complexImportScenario1/tsd1.xml} | 76 +-
.../complexImportScenario1/tsd2.xml} | 79 +-
.../complexImportScenario1/tsd3.xml} | 73 +-
.../complexImportScenario1/tsd4.xml} | 81 +-
.../complexImportScenario1/tsd5.xml} | 77 +-
.../complexImportScenario1/tsd6.xml} | 73 +-
.../TypeSystemDescriptionImplTest/Circular1.xml | 39 -
.../TypeSystemDescriptionImplTest/Circular2.xml | 38 -
.../test/resources/{log4j2.xml => log4j2-test.xml} | 6 +-
.../uima/collection/impl/cpm/engine/CPMEngine.java | 1138 +++++----
.../collection/impl/cpm/cpm_messages.properties | 988 ++++----
80 files changed, 6303 insertions(+), 3473 deletions(-)
create mode 100644
uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollectionImportResolverAdapter.java
create mode 100644
uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ImportResolver.java
create mode 100644
uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePrioritiesImportResolverAdapter.java
create mode 100644
uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescriptionImportResolverAdapter.java
create mode 100644
uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ImportResolverTest.java
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/cas.bin
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/cas.xcas
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/data.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/data.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644
uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Loop-with-2-nodes-1.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Loop-with-2-nodes-2.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Loop-with-3-nodes-1.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Loop-with-3-nodes-2.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Loop-with-3-nodes-3.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/SelfImport.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Transitive-with-3-nodes-1.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Transitive-with-3-nodes-2.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/Transitive-with-3-nodes-3.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd0.xml} (50%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd1.xml} (56%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd2.xml} (52%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd3.xml} (57%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd4.xml} (50%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd5.xml} (55%)
copy uimaj-core/src/test/resources/{log4j2.xml =>
ImportResolverTest/complexImportScenario1/tsd6.xml} (57%)
delete mode 100644
uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular1.xml
delete mode 100644
uimaj-core/src/test/resources/TypeSystemDescriptionImplTest/Circular2.xml
rename uimaj-core/src/test/resources/{log4j2.xml => log4j2-test.xml} (77%)
