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:29 UTC
[uima-uimaj] 01/01: Merge pull request #154 from
apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
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(-)