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 2022/02/10 08:24:54 UTC
[uima-uimaj] branch feature/UIMA-6358-ResourceManager_impl-should-provide-a-more-robust-way-to-register-multiple-datapaths updated (31ff5ce -> 24df973)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch feature/UIMA-6358-ResourceManager_impl-should-provide-a-more-robust-way-to-register-multiple-datapaths
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from 31ff5ce Merge branch 'main' into feature/UIMA-6358-ResourceManager_impl-should-provide-a-more-robust-way-to-register-multiple-datapaths
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 ac4221f [UIMA-6412] Stop using ThreadGroup in CPMEngine
add 2a02fa7 [UIMA-6412] Stop using ThreadGroup in CPMEngine
add 2f35b3f [UIMA-6412] Stop using ThreadGroup in CPMEngine
add 0ec2236 [UIMA-6412] Stop using ThreadGroup in CPMEngine
add e6d2ee5 [UIMA-6412] Stop using ThreadGroup in CPMEngine
add 8efb551 [UIMA-6373] Format UIMA Core Java SDK codebase
add c32d5b9 Merge pull request #166 from apache/refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
add 944f003 Merge branch 'main' into feature/UIMA-6412-Stop-using-ThreadGroup-in-CPMEngine
add 9ed4324 [UIMA-6412] Stop using ThreadGroup in CPMEngine
add a8893d1 Merge pull request #162 from apache/bugfix/UIMA-6401-CPE-ThreadGroupDestroyer-keeps-unnecessary-reference-on-CPMEngine
add 64fbcd2 Merge pull request #161 from apache/bugfix/UIMA-6400-UimaContextHolder-threadlocal-can-leak
add 410a8e9 [UIMA-6413] Memory leak in FSClassRegistry
add 093611a Merge pull request #167 from apache/bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add 72a8aca [UIMA-6413] Memory leak in FSClassRegistry
add 2b43d84 Merge pull request #168 from apache/bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add 4811860 [UIMA-6413] Memory leak in FSClassRegistry
add a3f7343 Merge branch 'main' into bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add 7c32476 Merge pull request #169 from apache/bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add 24f4894 Merge branch 'main' into bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add 6bc85d5 Merge pull request #171 from apache/bugfix/UIMA-6413-Memory-leak-in-FSClassRegistry
add b21e05e Merge branch 'main' into feature/UIMA-6412-Stop-using-ThreadGroup-in-CPMEngine
add 45c2d62 [UIMA-6374] Create CAS (de)serialization test suite
add 013e254 Merge pull request #172 from apache/feature/UIMA-6374-Create-CAS-de-serialization-test-suite
add ec19e92 Merge branch 'main' into feature/UIMA-6412-Stop-using-ThreadGroup-in-CPMEngine
add acc4301 Merge pull request #165 from apache/feature/UIMA-6412-Stop-using-ThreadGroup-in-CPMEngine
add 24df973 Merge branch 'main' into feature/UIMA-6358-ResourceManager_impl-should-provide-a-more-robust-way-to-register-multiple-datapaths
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 +
uimaj-core/pom.xml | 15 +-
.../java/org/apache/uima/UimaContextHolder.java | 107 +-
.../asb/impl/FlowControllerContainer.java | 1 -
.../impl/PrimitiveAnalysisEngine_impl.java | 20 +-
.../org/apache/uima/cas/impl/FSClassRegistry.java | 128 +-
.../org/apache/uima/internal/util/Class_TCCL.java | 5 -
.../apache/uima/internal/util/UIMAClassLoader.java | 13 +
.../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 -
.../apache/uima/cas/impl/FSClassRegistryTest.java | 96 +
...asSerializationDeserialization_BINARY_Test.java | 3 +-
...serialization_COMPRESSED_FILTERED_TSI_Test.java | 8 +-
.../CasSerializationDeserialization_XCAS_Test.java | 7 +-
...izationDeserialization_XMI_1_0_PRETTY_Test.java | 5 +-
...izationDeserialization_XMI_1_1_PRETTY_Test.java | 5 +-
.../uima/cas/serdes/CasToComparableText.java | 112 +-
.../uima/cas/serdes/PerformanceTestRunner.java | 167 ++
.../cas/serdes/Performance_SerialFormat_Test.java | 68 +
...erDesAssuptions.java => SerDesAssumptions.java} | 2 +-
.../uima/cas/serdes/SerDesCasIOTestUtils.java | 38 +-
.../ProgrammaticallyCreatedCasDataSuite.java | 111 +
.../generators/MultiFeatureRandomCasGenerator.java | 50 +-
.../cas/serdes/scenario/SerDesTestScenario.java | 4 +-
.../cas/serdes/scenario/SerRefTestScenario.java | 3 +-
.../org/apache/uima/impl/UimaContext_implTest.java | 1 -
.../resource/impl/ResourceManager_implTest.java | 10 +
.../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 +
.../ImportResolverTest/Loop-with-2-nodes-1.xml} | 38 +-
.../ImportResolverTest/Loop-with-2-nodes-2.xml} | 36 +-
.../ImportResolverTest/Loop-with-3-nodes-1.xml} | 36 +-
.../ImportResolverTest/Loop-with-3-nodes-2.xml} | 36 +-
.../ImportResolverTest/Loop-with-3-nodes-3.xml} | 36 +-
.../ImportResolverTest/SelfImport.xml} | 38 +-
.../Transitive-with-3-nodes-1.xml} | 36 +-
.../Transitive-with-3-nodes-2.xml} | 36 +-
.../Transitive-with-3-nodes-3.xml} | 35 +-
.../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 +-
.../cas_data/impl/vinci/VinciCasDataConverter.java | 63 +-
.../apache/uima/collection/impl/CasConverter.java | 3 +-
.../impl/CollectionProcessingEngine_impl.java | 22 +-
.../base_cpm/container/CasProcessorController.java | 3 +-
.../base_cpm/container/KillPipelineException.java | 1 -
.../base_cpm/container/ProcessingContainer.java | 4 +-
.../container/deployer/CasProcessorDeployer.java | 25 +-
.../deployer/CasProcessorDeploymentException.java | 19 +-
.../uima/collection/impl/cpm/BaseCPMImpl.java | 375 +--
.../apache/uima/collection/impl/cpm/CPEConfig.java | 20 +-
.../apache/uima/collection/impl/cpm/CPMImpl.java | 9 -
.../uima/collection/impl/cpm/Checkpoint.java | 61 +-
.../uima/collection/impl/cpm/CheckpointConfig.java | 8 +-
.../uima/collection/impl/cpm/CheckpointData.java | 15 +-
.../impl/cpm/StatusCallbackListenerImpl.java | 15 +-
.../collection/impl/cpm/container/CPEContext.java | 3 +-
.../collection/impl/cpm/container/CPEFactory.java | 633 ++---
.../CasObjectNetworkCasProcessorImpl.java | 63 +-
.../CasProcessorConfigurationJAXBImpl.java | 257 +-
.../cpm/container/NetworkCasProcessorImpl.java | 79 +-
.../cpm/container/ProcessingContainer_Impl.java | 327 ++-
.../impl/cpm/container/ServiceProxyPool.java | 191 +-
.../container/deployer/CPEDeployerDefaultImpl.java | 99 +-
.../impl/cpm/container/deployer/DeployFactory.java | 48 +-
.../container/deployer/FencedProcessReaper.java | 5 +-
.../cpm/container/deployer/JavaApplication.java | 44 +-
.../cpm/container/deployer/NonJavaApplication.java | 30 +-
.../container/deployer/RunnableApplication.java | 35 +-
.../impl/cpm/container/deployer/VinciTAP.java | 405 ++-
.../deployer/socket/OFSocketTransportImpl.java | 20 +-
.../deployer/socket/ProcessControllerAdapter.java | 15 +-
.../socket/SocketCasProcessorDeployer.java | 102 +-
.../container/deployer/socket/SocketTransport.java | 41 +-
.../deployer/vinci/VinciCasProcessorDeployer.java | 963 ++++----
.../impl/cpm/container/deployer/vns/LocalVNS.java | 77 +-
.../impl/cpm/container/deployer/vns/VNSQuery.java | 89 +-
.../impl/cpm/engine/ArtifactProducer.java | 204 +-
.../impl/cpm/engine/BoundedWorkQueue.java | 191 +-
.../collection/impl/cpm/engine/CPECasPool.java | 110 +-
.../impl/cpm/engine/CPMChunkTimeoutException.java | 13 +-
.../uima/collection/impl/cpm/engine/CPMEngine.java | 1161 ++++-----
.../impl/cpm/engine/CPMExecutorService.java | 179 ++
.../collection/impl/cpm/engine/CPMThreadGroup.java | 135 -
.../impl/cpm/engine/ConsumerCasUtils.java | 48 +-
.../impl/cpm/engine/DebugControlThread.java | 32 +-
.../impl/cpm/engine/NonThreadedProcessingUnit.java | 632 +++--
.../collection/impl/cpm/engine/ProcessingUnit.java | 914 ++++---
.../collection/impl/cpm/engine/SequencedQueue.java | 183 +-
.../uima/collection/impl/cpm/engine/WorkUnit.java | 11 +-
.../uima/collection/impl/cpm/utils/CPMUtils.java | 135 +-
.../collection/impl/cpm/utils/CasMetaData.java | 7 +-
.../collection/impl/cpm/utils/ChunkMetadata.java | 22 +-
.../impl/cpm/utils/ConfigurableFeature.java | 27 +-
.../impl/cpm/utils/CpmLocalizedMessage.java | 10 +-
.../uima/collection/impl/cpm/utils/Execute.java | 11 +-
.../collection/impl/cpm/utils/ExpirationTimer.java | 15 +-
.../uima/collection/impl/cpm/utils/FeatureMap.java | 15 +-
.../uima/collection/impl/cpm/utils/Filter.java | 61 +-
.../uima/collection/impl/cpm/utils/JavaTimer.java | 31 +-
.../collection/impl/cpm/utils/QueueEntity.java | 9 +-
.../uima/collection/impl/cpm/utils/Timer.java | 3 +-
.../collection/impl/cpm/utils/TimerFactory.java | 22 +-
.../cpm/utils/TypeComplianceConverterImpl.java | 24 +-
.../uima/collection/impl/cpm/utils/ValuePair.java | 9 +-
.../collection/impl/cpm/vinci/DATACasUtils.java | 139 +-
.../uima/collection/impl/cpm/vinci/Vinci.java | 65 +-
...rocessorConfigurationParameterSettingsImpl.java | 24 +-
.../impl/metadata/cpe/CasProcessorCpeObject.java | 188 +-
.../cpe/CasProcessorDeploymentParamImpl.java | 46 +-
.../cpe/CasProcessorDeploymentParamsImpl.java | 38 +-
.../cpe/CasProcessorErrorHandlingImpl.java | 20 +-
.../cpe/CasProcessorErrorRateThresholdImpl.java | 44 +-
.../impl/metadata/cpe/CasProcessorExecArgImpl.java | 30 +-
.../metadata/cpe/CasProcessorExecArgsImpl.java | 10 +-
.../metadata/cpe/CasProcessorExecutableImpl.java | 77 +-
.../impl/metadata/cpe/CasProcessorFilterImpl.java | 38 +-
.../metadata/cpe/CasProcessorMaxRestartsImpl.java | 37 +-
.../cpe/CasProcessorRunInSeperateProcessImpl.java | 16 +-
.../cpe/CasProcessorRuntimeEnvParamImpl.java | 36 +-
.../impl/metadata/cpe/CasProcessorTimeoutImpl.java | 27 +-
.../impl/metadata/cpe/CpeCasProcessorsImpl.java | 105 +-
.../impl/metadata/cpe/CpeCheckpointImpl.java | 36 +-
.../cpe/CpeCollectionReaderCasInitializerImpl.java | 34 +-
.../impl/metadata/cpe/CpeCollectionReaderImpl.java | 27 +-
.../cpe/CpeCollectionReaderIteratorImpl.java | 30 +-
.../metadata/cpe/CpeComponentDescriptorImpl.java | 66 +-
.../impl/metadata/cpe/CpeConfigurationImpl.java | 46 +-
.../impl/metadata/cpe/CpeDescriptionImpl.java | 169 +-
.../impl/metadata/cpe/CpeDescriptorFactory.java | 126 +-
.../impl/metadata/cpe/CpeIncludeImpl.java | 24 +-
.../cpe/CpeIntegratedCasProcessorImpl.java | 11 +-
.../metadata/cpe/CpeLocalCasProcessorImpl.java | 74 +-
.../collection/impl/metadata/cpe/CpeObject.java | 9 +-
.../metadata/cpe/CpeRemoteCasProcessorImpl.java | 12 +-
.../cpe/CpeResourceManagerConfigurationImpl.java | 26 +-
.../impl/metadata/cpe/CpeSofaMappingImpl.java | 25 +-
.../impl/metadata/cpe/CpeSofaMappingsImpl.java | 30 +-
.../collection/impl/metadata/cpe/CpeTimerImpl.java | 6 +-
.../impl/metadata/cpe/NameValuePairImpl.java | 25 +-
.../impl/metadata/cpe/OutputQueue_impl.java | 29 +-
.../collection/impl/cpm/cpm_messages.properties | 1268 +++++-----
.../impl/SofaNamingInAggregateTest.java | 52 +-
.../uima/analysis_engine/impl/TestAnnotator.java | 4 +-
.../java/org/apache/uima/cas/impl/CasTestUtil.java | 2 -
.../impl/CasHeapSizeTestCollectionReader.java | 6 +-
.../impl/CollectionProcessingEngine_implTest.java | 56 +-
.../collection/impl/SingleDocCollectionReader.java | 4 +-
.../uima/collection/impl/TestCasInitializer.java | 2 +-
.../uima/collection/impl/TestCasMultiplier.java | 27 +-
.../uima/collection/impl/cpm/CasPoolTest.java | 49 +-
.../impl/cpm/CpeCasProcessorAPI_Test.java | 65 +-
.../impl/cpm/CpeDescriptorSerialization_Test.java | 125 +-
.../uima/collection/impl/cpm/CpeImportTest.java | 68 +-
.../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 204 +-
.../impl/cpm/CpmCasConsumer_ErrorTest.java | 108 +-
.../impl/cpm/CpmCollectionReader_ErrorTest.java | 1295 +++++-----
.../uima/collection/impl/cpm/CpmInitTest.java | 35 +-
.../collection/impl/cpm/CpmProcessingTest.java | 111 +-
.../uima/collection/impl/cpm/CpmStopTest.java | 34 +-
.../uima/collection/impl/cpm/PearCasPoolTest.java | 66 +-
.../impl/cpm/SofaCPE_SofaUnawareCC_Test.java | 19 +-
.../uima/collection/impl/cpm/SofaCPE_Test.java | 19 +-
.../collection/impl/cpm/SofaMixedCPE_Test.java | 17 +-
.../impl/cpm/utils/DescriptorMakeUtil.java | 29 +-
.../impl/cpm/utils/ErrorTestAnnotator.java | 20 +-
.../impl/cpm/utils/ErrorTestCasConsumer.java | 8 +-
.../impl/cpm/utils/ErrorTestCollectionReader.java | 4 +-
.../impl/cpm/utils/FunctionErrorStore.java | 10 +-
.../collection/impl/cpm/utils/SlowAnnotator.java | 9 +-
.../uima/examples/cpm/sofa/CpmTestDriver.java | 4 +-
.../examples/cpm/sofa/SofaCollectionReader.java | 2 +-
.../uima/pear/util/ComponentCategoryTest.java | 8 +-
.../resource/impl/TestResourceInterface_impl.java | 11 +-
221 files changed, 12794 insertions(+), 8923 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/cas/impl/FSClassRegistryTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/serdes/PerformanceTestRunner.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/serdes/Performance_SerialFormat_Test.java
copy uimaj-core/src/test/java/org/apache/uima/cas/serdes/{SerDesAssuptions.java => SerDesAssumptions.java} (97%)
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/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Loop-with-2-nodes-1.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Loop-with-2-nodes-2.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Loop-with-3-nodes-1.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Loop-with-3-nodes-2.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Loop-with-3-nodes-3.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/SelfImport.xml} (58%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Transitive-with-3-nodes-1.xml} (57%)
copy uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Transitive-with-3-nodes-2.xml} (57%)
rename uimaj-core/src/test/{java/org/apache/uima/cas/serdes/SerDesAssuptions.java => resources/ImportResolverTest/Transitive-with-3-nodes-3.xml} (60%)
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%)
create mode 100644 uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMExecutorService.java
delete mode 100644 uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMThreadGroup.java