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/11/10 14:06:28 UTC
[uima-uimaj] branch maintenance/3.2.x updated (b4de8d1 -> 7b552b5)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch maintenance/3.2.x
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from 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
new 7b552b5 Merge pull request #154 from apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
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:
.gitignore | 2 +
.../uima/resource/impl/ResourceManager_impl.java | 18 +-
.../uima/resource/metadata/FsIndexCollection.java | 37 +-
.../uima/resource/metadata/TypePriorities.java | 38 +-
.../resource/metadata/TypeSystemDescription.java | 47 +-
.../FsIndexCollectionImportResolverAdapter.java | 79 +++
.../metadata/impl/FsIndexCollection_impl.java | 123 +----
.../resource/metadata/impl/ImportResolver.java | 284 +++++++++++
.../impl/TypePrioritiesImportResolverAdapter.java | 79 +++
.../metadata/impl/TypePriorities_impl.java | 121 ++---
...TypeSystemDescriptionImportResolverAdapter.java | 78 +++
.../metadata/impl/TypeSystemDescription_impl.java | 126 ++---
.../resource/metadata/impl/ImportResolverTest.java | 528 +++++++++++++++++++++
.../impl/TypeSystemDescription_implTest.java | 185 ++++----
.../Loop-with-2-nodes-1.xml} | 19 +-
.../Loop-with-2-nodes-2.xml} | 19 +-
.../Loop-with-3-nodes-1.xml} | 19 +-
.../Loop-with-3-nodes-2.xml} | 19 +-
.../Loop-with-3-nodes-3.xml} | 19 +-
.../SelfImport.xml} | 19 +-
.../Transitive-with-3-nodes-1.xml} | 19 +-
.../Transitive-with-3-nodes-2.xml} | 19 +-
.../Transitive-with-3-nodes-3.xml} | 18 +-
.../complexImportScenario1/tsd0.xml} | 73 +--
.../complexImportScenario1/tsd1.xml} | 74 +--
.../complexImportScenario1/tsd2.xml} | 71 +--
.../complexImportScenario1/tsd3.xml} | 71 +--
.../complexImportScenario1/tsd4.xml} | 73 +--
.../complexImportScenario1/tsd5.xml} | 75 +--
.../complexImportScenario1/tsd6.xml} | 71 +--
.../TypeSystemDescriptionImplTest/Circular1.xml | 39 --
.../TypeSystemDescriptionImplTest/Circular2.xml | 38 --
.../test/resources/{log4j2.xml => log4j2-test.xml} | 6 +-
33 files changed, 1695 insertions(+), 811 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
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Loop-with-2-nodes-1.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Loop-with-2-nodes-2.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Loop-with-3-nodes-1.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Loop-with-3-nodes-2.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Loop-with-3-nodes-3.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/SelfImport.xml} (78%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Transitive-with-3-nodes-1.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Transitive-with-3-nodes-2.xml} (77%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_jcas.xml => ImportResolverTest/Transitive-with-3-nodes-3.xml} (80%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_no_features.xml => ImportResolverTest/complexImportScenario1/tsd0.xml} (55%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_features.xml => ImportResolverTest/complexImportScenario1/tsd1.xml} (62%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_no_features.xml => ImportResolverTest/complexImportScenario1/tsd2.xml} (58%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_features.xml => ImportResolverTest/complexImportScenario1/tsd3.xml} (65%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_no_features.xml => ImportResolverTest/complexImportScenario1/tsd4.xml} (55%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_features.xml => ImportResolverTest/complexImportScenario1/tsd5.xml} (61%)
copy uimaj-core/src/test/resources/{ExampleCas/testTypeSystem_token_sentence_no_features.xml => ImportResolverTest/complexImportScenario1/tsd6.xml} (65%)
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%)
[uima-uimaj] 01/01: Merge pull request #154 from
apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch maintenance/3.2.x
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 7b552b553a9b0416b6595bc3522180f0c09ba104
Merge: b4de8d1 5d3cc35
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Nov 10 15:04:46 2021 +0100
Merge pull request #154 from apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
[UIMA-6393]: Circular imports break resource manager cache
.gitignore | 2 +
.../uima/resource/impl/ResourceManager_impl.java | 18 +-
.../uima/resource/metadata/FsIndexCollection.java | 37 +-
.../uima/resource/metadata/TypePriorities.java | 38 +-
.../resource/metadata/TypeSystemDescription.java | 47 +-
.../FsIndexCollectionImportResolverAdapter.java | 79 +++
.../metadata/impl/FsIndexCollection_impl.java | 123 +----
.../resource/metadata/impl/ImportResolver.java | 284 +++++++++++
.../impl/TypePrioritiesImportResolverAdapter.java | 79 +++
.../metadata/impl/TypePriorities_impl.java | 121 ++---
...TypeSystemDescriptionImportResolverAdapter.java | 78 +++
.../metadata/impl/TypeSystemDescription_impl.java | 126 ++---
.../resource/metadata/impl/ImportResolverTest.java | 528 +++++++++++++++++++++
.../impl/TypeSystemDescription_implTest.java | 185 ++++----
.../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 +-
33 files changed, 1929 insertions(+), 1095 deletions(-)