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/09 19:35:23 UTC

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated (989b4fc -> ed357df)

This is an automated email from the ASF dual-hosted git repository.

rec pushed a change to branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


    from 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

No new revisions were added by this update.

Summary of changes:
 .../uima/resource/metadata/FsIndexCollection.java  |  37 +-
 .../uima/resource/metadata/TypePriorities.java     |  38 +-
 .../resource/metadata/TypeSystemDescription.java   |   3 +-
 .../FsIndexCollectionImportResolverAdapter.java    |  79 ++++
 .../metadata/impl/FsIndexCollection_impl.java      | 123 ++----
 .../resource/metadata/impl/ImportResolver.java     | 260 ++++++++++++
 .../impl/TypePrioritiesImportResolverAdapter.java  |  79 ++++
 .../metadata/impl/TypePriorities_impl.java         | 121 ++----
 ...TypeSystemDescriptionImportResolverAdapter.java |  78 ++++
 .../metadata/impl/TypeSystemDescription_impl.java  | 192 +--------
 ...ption_implTest.java => ImportResolverTest.java} | 124 +++---
 .../impl/TypeSystemDescription_implTest.java       | 437 ---------------------
 .../test/resources/{log4j2.xml => log4j2-test.xml} |   6 +-
 13 files changed, 643 insertions(+), 934 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
 copy uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/{TypeSystemDescription_implTest.java => ImportResolverTest.java} (84%)
 rename uimaj-core/src/test/resources/{log4j2.xml => log4j2-test.xml} (77%)