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/12/09 19:27:40 UTC

[uima-uimaj] 01/01: Merge branch 'main' into bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers

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

rec pushed a commit to branch bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 2e8068869e48f978c60c073b97fa4ea875d72a77
Merge: e050dfa dfb081c
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Dec 9 20:26:39 2021 +0100

    Merge branch 'main' into bugfix/UIMA-6398-Classloader-paradoxon-and-memory-leak-in-UIMA-loggers
    
    * main: (68 commits)
      [UIMA-6397] Remove unnecessary code from Class_TCCL.java
      [UIMA-6374] Create CAS (de)serialization test suite
      Fixed v3 update site url
      [UIMA-6390] NPE when trying to access config names of fresh context
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6373] Format UIMA Core Java SDK codebase
      [UIMA-6378] Java SDK does not build on Java 16
      [UIMA-6374] Create CAS (de)serialization test suite
      [UIMA-6374] Create CAS (de)serialization test suite
      ...
    
    % Conflicts:
    %	uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
    %	uimaj-core/src/main/java/org/apache/uima/util/Logger.java
    %	uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java

 PearPackagingMavenPlugin/.gitignore                |    2 +
 PearPackagingMavenPlugin/pom.xml                   |    2 +-
 .../apache/uima/pear/tools/PearPackagingMojo.java  |    7 +-
 aggregate-uimaj-docbooks/pom.xml                   |    2 +-
 aggregate-uimaj-eclipse-plugins/pom.xml            |    2 +-
 aggregate-uimaj/pom.xml                            |    2 +-
 installEclipseSettings.sh                          |   71 +
 jVinci/.gitignore                                  |    2 +
 jVinci/pom.xml                                     |    2 +-
 .../org/apache/vinci/transport/Attributes.java     |    4 +-
 .../org/apache/vinci/transport/BaseServer.java     |    3 +-
 .../apache/vinci/transport/BaseServerRunnable.java |    1 +
 .../org/apache/vinci/transport/ErrorFrame.java     |    1 -
 .../java/org/apache/vinci/transport/Frame.java     |    3 +
 .../java/org/apache/vinci/transport/FrameLeaf.java |    1 +
 .../apache/vinci/transport/LeafCastException.java  |    1 -
 .../vinci/transport/SimpleTransportable.java       |    2 +
 .../org/apache/vinci/transport/VinciClient.java    |    3 +-
 .../org/apache/vinci/transport/VinciFrame.java     |    7 +
 .../vinci/transport/VinciServableAdapter.java      |    3 +
 .../org/apache/vinci/transport/VinciServer.java    |    2 +
 .../vinci/transport/VinciServerRunnable.java       |    1 +
 .../apache/vinci/transport/XTalkTransporter.java   |    2 +
 .../vinci/transport/context/VinciContext.java      |    1 +
 .../apache/vinci/transport/document/AFrame.java    |    5 +
 .../vinci/transport/document/AFrameLeaf.java       |    2 +
 .../vinci/transport/document/XMLToVinci.java       |   18 +-
 .../vinci/transport/document/XMLToXTalk.java       |    3 +
 .../vinci/transport/document/XTalkToSAX.java       |    3 +-
 .../transport/util/Base64FormatException.java      |    1 -
 .../vinci/transport/vns/client/ResolveResult.java  |    4 +
 .../vinci/transport/vns/client/ServeonResult.java  |    2 +
 .../vinci/transport/vns/service/Service.java       |    4 +
 .../vinci/transport/vns/service/ServiceAlias.java  |    1 +
 .../vinci/transport/vns/service/ServiceInfo.java   |    1 +
 .../transport/vns/service/ServiceInterface.java    |    2 +-
 .../transport/vns/service/ServiceRegistry.java     |    4 +-
 .../apache/vinci/transport/vns/service/VNS.java    |    7 +
 jcasgen-maven-plugin/.gitignore                    |    2 +
 jcasgen-maven-plugin/pom.xml                       |   13 +-
 .../uima/tools/jcasgen/maven/JCasGenM2ETest.java   |   12 +-
 .../uima/tools/jcasgen/maven/JCasGenMojo.java      |    6 +
 .../uima/tools/jcasgen/maven/JCasGenMojoTest.java  |   22 +-
 .../src/test/resources/invalidFeature/pom.xml      |   88 +-
 pom.xml                                            |    5 +-
 src/main/eclipse/org.eclipse.jdt.core.prefs        |  398 +
 src/main/eclipse/org.eclipse.jdt.ui.prefs          |  121 +
 uima-doc-v3-users-guide/pom.xml                    |    2 +-
 uima-docbook-overview-and-setup/pom.xml            |    2 +-
 .../src/docbook/eclipse_setup.xml                  |    2 +-
 uima-docbook-references/pom.xml                    |    2 +-
 uima-docbook-tools/pom.xml                         |    2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml    |    2 +-
 uimaj-adapter-soap/.gitignore                      |    2 +
 uimaj-adapter-soap/pom.xml                         |    2 +-
 uimaj-adapter-vinci/.gitignore                     |    2 +
 uimaj-adapter-vinci/pom.xml                        |   13 +-
 .../uima/adapter/vinci/CASTransportable.java       |   19 +-
 .../vinci/VinciAnalysisEngineServiceAdapter.java   |    1 +
 .../VinciBinaryAnalysisEngineServiceStub.java      |    5 +
 .../VinciBinaryAnalysisEngineService_impl.java     |    3 +
 .../apache/uima/adapter/vinci/util/Descriptor.java |    1 +
 .../adapter/vinci/util/SaxVinciFrameBuilder.java   |    7 +-
 .../vinci/util/UimaSaxVinciFrameBuilder.java       |    1 +
 .../uima/adapter/vinci/util/VinciSaxParser.java    |    7 +-
 .../VinciAnalysisEngineServiceAdapterTest.java     |   78 +-
 uimaj-bootstrap/.gitignore                         |    2 +
 uimaj-bootstrap/pom.xml                            |    2 +-
 .../org/apache/uima/bootstrap/UimaBootstrap.java   |  417 +-
 uimaj-component-test-util/.gitignore               |    2 +
 uimaj-component-test-util/pom.xml                  |   11 +-
 .../AnnotatorPerformanceTester.java                |    4 +-
 .../uima/test/junit_extension/AnnotatorTester.java |   77 +-
 .../junit_extension/PerformanceTestResult.java     |   36 +-
 uimaj-core/.gitignore                              |    2 +
 uimaj-core/pom.xml                                 |  249 +-
 .../org/apache/uima/CompositeResourceFactory.java  |    6 +-
 .../src/main/java/org/apache/uima/Constants.java   |   15 +-
 .../main/java/org/apache/uima/I18nExceptionI.java  |  200 +-
 .../apache/uima/InternationalizedException.java    |  381 +-
 .../uima/InternationalizedRuntimeException.java    |   68 +-
 .../main/java/org/apache/uima/List_of_ints.java    |  864 +-
 .../main/java/org/apache/uima/ResourceFactory.java |   37 +-
 .../org/apache/uima/ResourceSpecifierFactory.java  |  141 +-
 .../main/java/org/apache/uima/UIMAException.java   |   97 +-
 .../main/java/org/apache/uima/UIMAFramework.java   |  511 +-
 .../java/org/apache/uima/UIMARuntimeException.java |  144 +-
 .../apache/uima/UIMA_IllegalArgumentException.java |   17 +-
 .../apache/uima/UIMA_IllegalStateException.java    |   40 +-
 .../uima/UIMA_UnsupportedOperationException.java   |   20 +-
 .../src/main/java/org/apache/uima/UimaContext.java |  241 +-
 .../java/org/apache/uima/UimaContextAdmin.java     |   71 +-
 .../java/org/apache/uima/UimaContextHolder.java    |   24 +-
 .../java/org/apache/uima/UimaSerializable.java     |   99 +-
 .../java/org/apache/uima/UimaSerializableFSs.java  |   75 +-
 .../uima/analysis_component/AnalysisComponent.java |   24 +-
 .../AnalysisComponent_ImplBase.java                |   27 +-
 .../analysis_component/Annotator_ImplBase.java     |    3 +
 .../analysis_component/CasAnnotator_ImplBase.java  |   17 +-
 .../analysis_component/CasMultiplier_ImplBase.java |   24 +-
 .../analysis_component/JCasAnnotator_ImplBase.java |    9 +-
 .../JCasMultiplier_ImplBase.java                   |   16 +-
 .../uima/analysis_engine/AnalysisEngine.java       |  286 +-
 .../analysis_engine/AnalysisEngineDescription.java |  106 +-
 .../analysis_engine/AnalysisEngineManagement.java  |   26 +-
 .../AnalysisEngineProcessException.java            |   29 +-
 .../analysis_engine/AnalysisEngineServiceStub.java |   20 +-
 .../uima/analysis_engine/AnalysisProcessData.java  |   12 +-
 .../apache/uima/analysis_engine/CasIterator.java   |   11 +-
 .../apache/uima/analysis_engine/JCasIterator.java  |   11 +-
 .../ResultNotSupportedException.java               |   20 +-
 .../uima/analysis_engine/ResultSpecification.java  |  302 +-
 .../uima/analysis_engine/TaeDescription.java       |    1 -
 .../uima/analysis_engine/TextAnalysisEngine.java   |    1 -
 .../apache/uima/analysis_engine/TypeOrFeature.java |   15 +-
 .../annotator/AnnotatorConfigurationException.java |   27 +-
 .../annotator/AnnotatorContext.java                |  186 +-
 .../annotator/AnnotatorContextException.java       |   20 +-
 .../AnnotatorInitializationException.java          |   23 +-
 .../annotator/AnnotatorProcessException.java       |   18 +-
 .../annotator/Annotator_ImplBase.java              |   19 +-
 .../analysis_engine/annotator/BaseAnnotator.java   |   17 +-
 .../annotator/GenericAnnotator.java                |    4 +-
 .../annotator/GenericAnnotator_ImplBase.java       |    6 +-
 .../analysis_engine/annotator/JTextAnnotator.java  |    4 +-
 .../annotator/JTextAnnotator_ImplBase.java         |    2 +-
 .../analysis_engine/annotator/TextAnnotator.java   |    4 +-
 .../org/apache/uima/analysis_engine/asb/ASB.java   |   48 +-
 .../uima/analysis_engine/asb/impl/ASB_impl.java    |  205 +-
 .../analysis_engine/asb/impl/FlowContainer.java    |   34 +-
 .../asb/impl/FlowControllerContainer.java          |  110 +-
 .../impl/AggregateAnalysisEngine_impl.java         |  109 +-
 .../impl/AnalysisEngineDescription_impl.java       |  273 +-
 .../impl/AnalysisEngineImplBase.java               |  255 +-
 .../impl/AnalysisEngineManagementImpl.java         |  101 +-
 .../impl/AnalysisEngineManagementImplMBean.java    |   12 +-
 .../impl/AnalysisProcessData_impl.java             |   20 +-
 .../impl/AnnotatorContext_impl.java                |   49 +-
 .../analysis_engine/impl/EmptyCasIterator.java     |    3 +
 .../analysis_engine/impl/JCasIteratorWrapper.java  |    3 +
 .../impl/MultiprocessingAnalysisEngine_impl.java   |  160 +-
 .../impl/PearAnalysisEngineWrapper.java            |  655 +-
 .../impl/PrimitiveAnalysisEngine_impl.java         |  304 +-
 .../impl/ResultSpecification_impl.java             |  305 +-
 .../apache/uima/analysis_engine/impl/RsFeat.java   |  106 +-
 .../apache/uima/analysis_engine/impl/RsFeats.java  |  265 +-
 .../uima/analysis_engine/impl/RsFullFeatNames.java |  122 +-
 .../apache/uima/analysis_engine/impl/RsLang.java   |  115 +-
 .../apache/uima/analysis_engine/impl/RsLangs.java  |  728 +-
 .../apache/uima/analysis_engine/impl/RsType.java   |  294 +-
 .../uima/analysis_engine/impl/RsTypesMap.java      |  553 +-
 .../analysis_engine/impl/TaeDescription_impl.java  |    4 +-
 .../analysis_engine/impl/TypeOrFeature_impl.java   |   36 +-
 .../impl/UimacppAnalysisEngineImpl.java            |  126 +-
 .../AnalysisComponentAdapterFactory.java           |    7 +-
 .../impl/compatibility/AnnotatorAdapter.java       |   41 +-
 .../impl/compatibility/CasConsumerAdapter.java     |   21 +-
 .../compatibility/CollectionReaderAdapter.java     |   23 +-
 .../metadata/AnalysisEngineMetaData.java           |   26 +-
 .../metadata/CapabilityLanguageFlow.java           |   13 +-
 .../uima/analysis_engine/metadata/FixedFlow.java   |   20 +-
 .../analysis_engine/metadata/FlowConstraints.java  |   10 +-
 .../metadata/FlowControllerDeclaration.java        |   32 +-
 .../uima/analysis_engine/metadata/SofaMapping.java |   18 +-
 .../metadata/impl/AnalysisEngineMetaData_impl.java |   55 +-
 .../metadata/impl/CapabilityLanguageFlow_impl.java |   19 +-
 .../metadata/impl/FixedFlow_impl.java              |    5 +
 .../impl/FlowControllerDeclaration_impl.java       |   32 +-
 .../metadata/impl/SofaMapping_impl.java            |   15 +-
 .../service/impl/AnalysisEngineServiceAdapter.java |   20 +-
 .../service/impl/AnalysisEngineService_impl.java   |   25 +-
 .../service/impl/ServiceDataCargo.java             |   33 +-
 .../main/java/org/apache/uima/cas/AbstractCas.java |    3 +-
 .../org/apache/uima/cas/AbstractCas_ImplBase.java  |    5 +-
 .../java/org/apache/uima/cas/AnnotationBaseFS.java |    4 +-
 .../src/main/java/org/apache/uima/cas/ArrayFS.java |   42 +-
 .../java/org/apache/uima/cas/BooleanArrayFS.java   |   14 +-
 .../main/java/org/apache/uima/cas/ByteArrayFS.java |   13 +-
 .../src/main/java/org/apache/uima/cas/CAS.java     |  633 +-
 .../java/org/apache/uima/cas/CASException.java     |   23 +-
 .../org/apache/uima/cas/CASRuntimeException.java   |  459 +-
 .../main/java/org/apache/uima/cas/CasOwner.java    |    5 +-
 .../java/org/apache/uima/cas/CommonArrayFS.java    |   52 +-
 .../org/apache/uima/cas/ConstraintFactory.java     |    7 +-
 .../java/org/apache/uima/cas/DoubleArrayFS.java    |    8 +-
 .../org/apache/uima/cas/FSBooleanConstraint.java   |  101 +-
 .../java/org/apache/uima/cas/FSComparators.java    |   66 +-
 .../src/main/java/org/apache/uima/cas/FSIndex.java |  229 +-
 .../org/apache/uima/cas/FSIndexRepository.java     |  176 +-
 .../main/java/org/apache/uima/cas/FSIterator.java  |  203 +-
 .../src/main/java/org/apache/uima/cas/Feature.java |   28 +-
 .../main/java/org/apache/uima/cas/FeaturePath.java |  473 +-
 .../java/org/apache/uima/cas/FeatureStructure.java |   81 +-
 .../java/org/apache/uima/cas/FeatureValuePath.java |   72 +-
 .../java/org/apache/uima/cas/FloatArrayFS.java     |   12 +-
 .../main/java/org/apache/uima/cas/IntArrayFS.java  |   14 +-
 .../main/java/org/apache/uima/cas/LongArrayFS.java |   15 +-
 .../src/main/java/org/apache/uima/cas/Marker.java  |   53 +-
 .../java/org/apache/uima/cas/ParsingException.java |    5 +-
 .../main/java/org/apache/uima/cas/SelectFSs.java   | 1835 +++--
 .../java/org/apache/uima/cas/SerialFormat.java     |   53 +-
 .../java/org/apache/uima/cas/ShortArrayFS.java     |   13 +-
 .../src/main/java/org/apache/uima/cas/SofaFS.java  |   45 +-
 .../src/main/java/org/apache/uima/cas/SofaID.java  |   16 +-
 .../java/org/apache/uima/cas/StringArrayFS.java    |   73 +-
 .../src/main/java/org/apache/uima/cas/Type.java    |   25 +-
 .../main/java/org/apache/uima/cas/TypeClass.java   |   51 +-
 .../java/org/apache/uima/cas/TypeNameSpace.java    |    2 -
 .../main/java/org/apache/uima/cas/TypeSystem.java  |   40 +-
 .../apache/uima/cas/admin/CASAdminException.java   |   35 +-
 .../java/org/apache/uima/cas/admin/CASFactory.java |   15 +-
 .../java/org/apache/uima/cas/admin/CASMgr.java     |   17 +-
 .../apache/uima/cas/admin/FSIndexComparator.java   |   27 +-
 .../uima/cas/admin/FSIndexRepositoryMgr.java       |   15 +-
 .../org/apache/uima/cas/admin/LinearTypeOrder.java |   27 +-
 .../uima/cas/admin/LinearTypeOrderBuilder.java     |   10 +-
 .../org/apache/uima/cas/admin/TypeSystemMgr.java   |  114 +-
 .../main/java/org/apache/uima/cas/impl/AllFSs.java |  383 +-
 .../apache/uima/cas/impl/AllowPreexistingFS.java   |   48 +-
 .../apache/uima/cas/impl/AnnotationBaseImpl.java   |   61 +-
 .../org/apache/uima/cas/impl/AnnotationImpl.java   |   61 +-
 .../uima/cas/impl/AnnotationImplException.java     |   12 +-
 .../apache/uima/cas/impl/AnnotationTreeImpl.java   |    4 +-
 .../uima/cas/impl/AnnotationTreeNodeImpl.java      |   13 +-
 .../org/apache/uima/cas/impl/BinaryCasSerDes.java  | 4049 +++++-----
 .../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 3150 ++++----
 .../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 2943 +++----
 .../apache/uima/cas/impl/BooleanArrayFSImpl.java   |   62 +-
 .../apache/uima/cas/impl/BooleanConstraint.java    |  130 +-
 .../org/apache/uima/cas/impl/BuiltinTypeKinds.java |  358 +-
 .../org/apache/uima/cas/impl/ByteArrayFSImpl.java  |   62 +-
 .../java/org/apache/uima/cas/impl/ByteHeap.java    |  237 +-
 .../uima/cas/impl/CASCompleteSerializer.java       |    3 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     | 3825 ++++-----
 .../org/apache/uima/cas/impl/CASMgrSerializer.java |  147 +-
 .../org/apache/uima/cas/impl/CASSerializer.java    |  756 +-
 .../java/org/apache/uima/cas/impl/CasCompare.java  | 4471 ++++++-----
 .../org/apache/uima/cas/impl/CasSeqAddrMaps.java   |  127 +-
 .../apache/uima/cas/impl/CasSerializerSupport.java | 2871 +++----
 .../java/org/apache/uima/cas/impl/CasState.java    |  117 +-
 .../apache/uima/cas/impl/CasTypeSystemMapper.java  |  143 +-
 .../apache/uima/cas/impl/CommonArrayFSImpl.java    |   61 +-
 .../org/apache/uima/cas/impl/CommonAuxHeap.java    |  402 +-
 .../org/apache/uima/cas/impl/CommonSerDes.java     |  566 +-
 .../uima/cas/impl/CommonSerDesSequential.java      |  432 +-
 .../uima/cas/impl/ConjunctiveConstraint.java       |    3 +-
 .../uima/cas/impl/ConstraintFactoryImpl.java       |  116 +-
 .../apache/uima/cas/impl/CopyOnWriteIndexPart.java |  117 +-
 .../uima/cas/impl/DebugFSLogicalStructure.java     |   29 +-
 .../apache/uima/cas/impl/DebugNameValuePair.java   |    1 +
 .../apache/uima/cas/impl/DeferredIndexUpdates.java |  146 +-
 .../uima/cas/impl/DisjunctiveConstraint.java       |    3 +-
 .../apache/uima/cas/impl/DoubleArrayFSImpl.java    |   62 +-
 .../apache/uima/cas/impl/EmbeddedConstraint.java   |    2 +
 .../uima/cas/impl/FSBooleanConstraintImpl.java     |  132 +-
 .../org/apache/uima/cas/impl/FSClassRegistry.java  | 1770 +++--
 .../org/apache/uima/cas/impl/FSComparator.java     |    5 +-
 .../java/org/apache/uima/cas/impl/FSGenerator.java |   73 +-
 .../org/apache/uima/cas/impl/FSImplComparator.java |    8 +-
 .../uima/cas/impl/FSIndexComparatorImpl.java       |   81 +-
 .../uima/cas/impl/FSIndexRepositoryImpl.java       | 1695 ++--
 .../apache/uima/cas/impl/FSIntConstraintImpl.java  |    7 +
 .../apache/uima/cas/impl/FSIteratorImplBase.java   |  223 +-
 .../uima/cas/impl/FSStringConstraintImpl.java      |    1 -
 .../apache/uima/cas/impl/FSTypeConstraintImpl.java |  112 +-
 .../org/apache/uima/cas/impl/FSsTobeAddedback.java |  109 +-
 .../java/org/apache/uima/cas/impl/FeatureImpl.java |  267 +-
 .../uima/cas/impl/FeatureImpl_jcas_only.java       |   92 +-
 .../org/apache/uima/cas/impl/FeaturePathImpl.java  |  443 +-
 .../apache/uima/cas/impl/FeatureStructureImpl.java |   12 +-
 .../uima/cas/impl/FeatureStructureImplC.java       | 1868 +++--
 .../apache/uima/cas/impl/FeatureValuePathImpl.java | 2125 ++---
 .../org/apache/uima/cas/impl/FilteredIterator.java |   49 +-
 .../org/apache/uima/cas/impl/FloatArrayFSImpl.java |   62 +-
 .../org/apache/uima/cas/impl/FsGenerator3.java     |   64 +-
 .../org/apache/uima/cas/impl/FsGeneratorArray.java |   65 +-
 .../apache/uima/cas/impl/FsIndex_annotation.java   |  316 +-
 .../java/org/apache/uima/cas/impl/FsIndex_bag.java |  171 +-
 .../org/apache/uima/cas/impl/FsIndex_flat.java     |  466 +-
 .../org/apache/uima/cas/impl/FsIndex_iicp.java     | 1263 +--
 .../apache/uima/cas/impl/FsIndex_set_sorted.java   |  572 +-
 .../apache/uima/cas/impl/FsIndex_singletype.java   |  212 +-
 .../org/apache/uima/cas/impl/FsIndex_snapshot.java |  344 +-
 .../cas/impl/FsIterator_aggregation_common.java    |  604 +-
 .../apache/uima/cas/impl/FsIterator_backwards.java |  296 +-
 .../org/apache/uima/cas/impl/FsIterator_bag.java   |  404 +-
 .../apache/uima/cas/impl/FsIterator_bag_pear.java  |   97 +-
 .../apache/uima/cas/impl/FsIterator_limited.java   |  457 +-
 .../uima/cas/impl/FsIterator_multiple_indexes.java |  414 +-
 .../uima/cas/impl/FsIterator_set_sorted2.java      |  677 +-
 .../uima/cas/impl/FsIterator_set_sorted_pear.java  |   99 +-
 .../uima/cas/impl/FsIterator_singletype.java       |  203 +-
 .../uima/cas/impl/FsIterator_subtypes_ordered.java | 1266 +--
 .../cas/impl/FsIterator_subtypes_snapshot.java     |  557 +-
 .../main/java/org/apache/uima/cas/impl/Heap.java   |  627 +-
 .../main/java/org/apache/uima/cas/impl/Id2FS.java  |  704 +-
 .../org/apache/uima/cas/impl/IntArrayFSImpl.java   |   62 +-
 .../org/apache/uima/cas/impl/IntConstraint.java    |    2 +
 .../uima/cas/impl/LLUnambiguousIteratorImpl.java   |   31 +-
 .../uima/cas/impl/LinearTypeOrderBuilderImpl.java  |  152 +-
 .../org/apache/uima/cas/impl/LongArrayFSImpl.java  |   62 +-
 .../java/org/apache/uima/cas/impl/LongHeap.java    |  228 +-
 .../java/org/apache/uima/cas/impl/LongSet.java     |  155 +-
 .../java/org/apache/uima/cas/impl/LowLevelCAS.java |  127 +-
 .../apache/uima/cas/impl/LowLevelException.java    |   13 +-
 .../org/apache/uima/cas/impl/LowLevelIndex.java    |  150 +-
 .../uima/cas/impl/LowLevelIndexRepository.java     |   11 +-
 .../org/apache/uima/cas/impl/LowLevelIterator.java |   87 +-
 .../uima/cas/impl/LowLevelIterator_empty.java      |  176 +-
 .../apache/uima/cas/impl/LowLevelTypeSystem.java   |   45 +-
 .../java/org/apache/uima/cas/impl/MarkerImpl.java  |   52 +-
 .../apache/uima/cas/impl/MethodHandlesLookup.java  |   65 +-
 .../apache/uima/cas/impl/OutOfTypeSystemData.java  |   27 +-
 .../org/apache/uima/cas/impl/PathConstraint.java   |    1 -
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   | 3611 ++++-----
 .../org/apache/uima/cas/impl/Serialization.java    |  334 +-
 .../org/apache/uima/cas/impl/ShortArrayFSImpl.java |   62 +-
 .../java/org/apache/uima/cas/impl/ShortHeap.java   |  214 +-
 .../java/org/apache/uima/cas/impl/SlotKinds.java   |   90 +-
 .../apache/uima/cas/impl/SlotKindsConstants.java   |  139 +-
 .../java/org/apache/uima/cas/impl/SofaFSImpl.java  |   61 +-
 .../apache/uima/cas/impl/StringArrayFSImpl.java    |   62 +-
 .../org/apache/uima/cas/impl/StringConstraint.java |    2 +
 .../java/org/apache/uima/cas/impl/StringHeap.java  |  126 +-
 .../cas/impl/StringHeapDeserializationHelper.java  |    5 +-
 .../java/org/apache/uima/cas/impl/StringSet.java   |  158 +-
 .../java/org/apache/uima/cas/impl/Subiterator.java | 1036 ++-
 .../java/org/apache/uima/cas/impl/TypeImpl.java    |  984 +--
 .../org/apache/uima/cas/impl/TypeImpl_annot.java   |   74 +-
 .../apache/uima/cas/impl/TypeImpl_annotBase.java   |   75 +-
 .../org/apache/uima/cas/impl/TypeImpl_array.java   |  317 +-
 .../org/apache/uima/cas/impl/TypeImpl_list.java    |   75 +-
 .../apache/uima/cas/impl/TypeImpl_primitive.java   |   78 +-
 .../org/apache/uima/cas/impl/TypeImpl_string.java  |   97 +-
 .../uima/cas/impl/TypeImpl_stringSubtype.java      |  104 +-
 .../apache/uima/cas/impl/TypeNameSpaceImpl.java    |    1 +
 .../org/apache/uima/cas/impl/TypeSystem2Xml.java   |   74 +-
 .../apache/uima/cas/impl/TypeSystemConstants.java  |  236 +-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   | 2783 +++----
 .../org/apache/uima/cas/impl/TypeSystemUtils.java  |   87 +-
 .../org/apache/uima/cas/impl/UimaDecompiler.java   |  704 +-
 .../org/apache/uima/cas/impl/XCASDeserializer.java |  251 +-
 .../apache/uima/cas/impl/XCASParsingException.java |   52 +-
 .../org/apache/uima/cas/impl/XCASSerializer.java   |  156 +-
 .../apache/uima/cas/impl/XMLTypeSystemConsts.java  |   16 +-
 .../apache/uima/cas/impl/XmiCasDeserializer.java   | 1462 ++--
 .../org/apache/uima/cas/impl/XmiCasSerializer.java | 1035 +--
 .../uima/cas/impl/XmiSerializationSharedData.java  |  445 +-
 .../org/apache/uima/cas/text/AnnotationFS.java     |   69 +-
 .../org/apache/uima/cas/text/AnnotationIndex.java  |  245 +-
 .../apache/uima/cas/text/AnnotationPredicates.java |   15 +-
 .../org/apache/uima/cas/text/AnnotationTree.java   |    4 -
 .../apache/uima/cas/text/AnnotationTreeNode.java   |    4 -
 .../java/org/apache/uima/cas/text/Language.java    |    5 +-
 .../java/org/apache/uima/cas_data/CasData.java     |    6 +-
 .../org/apache/uima/cas_data/FeatureStructure.java |   25 +-
 .../org/apache/uima/cas_data/FeatureValue.java     |    2 +-
 .../org/apache/uima/cas_data/PrimitiveArrayFS.java |    8 +-
 .../org/apache/uima/cas_data/PrimitiveValue.java   |    7 +-
 .../org/apache/uima/cas_data/ReferenceArrayFS.java |    4 +-
 .../org/apache/uima/cas_data/ReferenceValue.java   |    4 +-
 .../org/apache/uima/cas_data/impl/CasDataImpl.java |   17 +-
 .../apache/uima/cas_data/impl/CasDataToXCas.java   |   16 +-
 .../apache/uima/cas_data/impl/CasDataUtils.java    |  118 +-
 .../uima/cas_data/impl/FeatureStructureImpl.java   |   25 +-
 .../uima/cas_data/impl/PrimitiveArrayFSImpl.java   |   14 +-
 .../uima/cas_data/impl/PrimitiveValueImpl.java     |   28 +-
 .../uima/cas_data/impl/ReferenceArrayFSImpl.java   |   11 +-
 .../uima/cas_data/impl/ReferenceValueImpl.java     |   11 +-
 .../cas_data/impl/XCasToCasDataSaxHandler.java     |   23 +-
 .../org/apache/uima/collection/CasConsumer.java    |    7 +-
 .../uima/collection/CasConsumerDescription.java    |    6 +-
 .../uima/collection/CasConsumer_ImplBase.java      |   31 +-
 .../org/apache/uima/collection/CasInitializer.java |   11 +-
 .../uima/collection/CasInitializerDescription.java |    3 +-
 .../uima/collection/CasInitializer_ImplBase.java   |    9 +-
 .../uima/collection/CollectionException.java       |   20 +-
 .../collection/CollectionProcessingEngine.java     |   43 +-
 .../collection/CollectionProcessingManager.java    |   58 +-
 .../apache/uima/collection/CollectionReader.java   |   20 +-
 .../collection/CollectionReaderDescription.java    |   10 +-
 .../uima/collection/CollectionReader_ImplBase.java |   20 +-
 .../uima/collection/EntityProcessStatus.java       |   20 +-
 .../uima/collection/StatusCallbackListener.java    |    5 +-
 .../apache/uima/collection/base_cpm/BaseCPM.java   |   68 +-
 .../collection/base_cpm/BaseCollectionReader.java  |   22 +-
 .../base_cpm/BaseStatusCallbackListener.java       |   12 +-
 .../base_cpm/CasDataCollectionReader.java          |   18 +-
 .../base_cpm/CasDataCollectionReader_ImplBase.java |    4 +
 .../uima/collection/base_cpm/CasDataConsumer.java  |   12 +-
 .../base_cpm/CasDataConsumer_ImplBase.java         |    9 +-
 .../collection/base_cpm/CasDataInitializer.java    |   13 +-
 .../base_cpm/CasDataInitializer_ImplBase.java      |   10 +-
 .../uima/collection/base_cpm/CasDataProcessor.java |   11 +-
 .../base_cpm/CasDataStatusCallbackListener.java    |    5 +-
 .../collection/base_cpm/CasObjectProcessor.java    |   13 +-
 .../uima/collection/base_cpm/CasProcessor.java     |   16 +-
 .../base_cpm/RecoverableCollectionReader.java      |   15 +-
 .../uima/collection/base_cpm/SkipCasException.java |    2 -
 .../uima/collection/base_cpm/SynchPoint.java       |   24 +-
 .../impl/CasConsumerDescription_impl.java          |   22 +-
 .../impl/CasInitializerDescription_impl.java       |   17 +-
 .../impl/CollectionReaderDescription_impl.java     |   29 +-
 ...CasProcessorConfigurationParameterSettings.java |   12 +-
 .../metadata/CasProcessorDeploymentParam.java      |   45 +-
 .../metadata/CasProcessorDeploymentParams.java     |   29 +-
 .../metadata/CasProcessorErrorHandling.java        |   22 +-
 .../metadata/CasProcessorErrorRateThreshold.java   |   38 +-
 .../collection/metadata/CasProcessorExecArg.java   |   14 +-
 .../collection/metadata/CasProcessorExecArgs.java  |   23 +-
 .../metadata/CasProcessorExecutable.java           |   39 +-
 .../collection/metadata/CasProcessorFilter.java    |   16 +-
 .../metadata/CasProcessorMaxRestarts.java          |   37 +-
 .../metadata/CasProcessorRunInSeperateProcess.java |    8 +-
 .../metadata/CasProcessorRuntimeEnvParam.java      |   28 +-
 .../collection/metadata/CasProcessorTimeout.java   |    8 +-
 .../uima/collection/metadata/CpeCasProcessor.java  |  196 +-
 .../uima/collection/metadata/CpeCasProcessors.java |   89 +-
 .../uima/collection/metadata/CpeCheckpoint.java    |   32 +-
 .../collection/metadata/CpeCollectionReader.java   |   35 +-
 .../CpeCollectionReaderCasInitializer.java         |   22 +-
 .../metadata/CpeCollectionReaderIterator.java      |   25 +-
 .../metadata/CpeComponentDescriptor.java           |   45 +-
 .../uima/collection/metadata/CpeConfiguration.java |   75 +-
 .../uima/collection/metadata/CpeDescription.java   |  188 +-
 .../uima/collection/metadata/CpeInclude.java       |    8 +-
 .../collection/metadata/CpeLocalCasProcessor.java  |   36 +-
 .../metadata/CpeResourceManagerConfiguration.java  |    8 +-
 .../uima/collection/metadata/CpeSofaMapping.java   |   14 +-
 .../uima/collection/metadata/CpeSofaMappings.java  |    7 +-
 .../apache/uima/collection/metadata/CpeTimer.java  |   11 +-
 .../uima/collection/metadata/NameValuePair.java    |    8 +-
 .../uima/collection/metadata/OutputQueue.java      |   15 +-
 .../uima/examples/SourceDocumentInformation.java   |    4 +-
 .../uima/flow/CasFlowController_ImplBase.java      |   10 +-
 .../org/apache/uima/flow/CasFlow_ImplBase.java     |   36 +-
 .../src/main/java/org/apache/uima/flow/Flow.java   |   49 +-
 .../java/org/apache/uima/flow/FlowController.java  |   56 +-
 .../uima/flow/FlowControllerDescription.java       |    2 +-
 .../apache/uima/flow/FlowController_ImplBase.java  |   29 +-
 .../uima/flow/JCasFlowController_ImplBase.java     |   12 +-
 .../org/apache/uima/flow/JCasFlow_ImplBase.java    |   33 +-
 .../java/org/apache/uima/flow/ParallelStep.java    |   19 +-
 .../main/java/org/apache/uima/flow/SimpleStep.java |    5 +-
 .../apache/uima/flow/SimpleStepWithResultSpec.java |   21 +-
 .../flow/impl/AnalysisSequenceCapabilityNode.java  |   21 +-
 .../impl/CapabilityLanguageFlowController.java     |  103 +-
 .../flow/impl/CapabilityLanguageFlowObject.java    |  364 +-
 .../apache/uima/flow/impl/FixedFlowController.java |  147 +-
 .../uima/flow/impl/FlowControllerContext_impl.java |   31 +-
 .../flow/impl/FlowControllerDescription_impl.java  |   16 +-
 .../uima/impl/AnalysisEngineFactory_impl.java      |    9 +-
 .../apache/uima/impl/CasConsumerFactory_impl.java  |   30 +-
 .../uima/impl/CasInitializerFactory_impl.java      |   29 +-
 .../apache/uima/impl/ChildUimaContext_impl.java    |   26 +-
 .../uima/impl/CollectionReaderFactory_impl.java    |   41 +-
 .../uima/impl/CompositeResourceFactory_impl.java   |   11 +-
 .../uima/impl/CustomResourceFactory_impl.java      |   58 +-
 .../uima/impl/ResourceSpecifierFactory_impl.java   |   84 +-
 .../org/apache/uima/impl/RootUimaContext_impl.java |   19 +-
 .../java/org/apache/uima/impl/SofaID_impl.java     |    4 +
 .../org/apache/uima/impl/UIMAFramework_impl.java   |   96 +-
 .../org/apache/uima/impl/UimaContext_ImplBase.java |  292 +-
 .../src/main/java/org/apache/uima/impl/Util.java   |   94 +-
 .../uima/internal/util/AnalysisEnginePool.java     |   59 +-
 .../org/apache/uima/internal/util/BinaryTree.java  |    1 -
 .../org/apache/uima/internal/util/BrowserUtil.java |   19 +-
 .../uima/internal/util/CharArraySpanMap.java       |    2 -
 .../apache/uima/internal/util/CharArrayString.java |   14 +-
 .../apache/uima/internal/util/CharacterUtils.java  |    5 +-
 .../org/apache/uima/internal/util/Class_TCCL.java  |  203 +-
 .../uima/internal/util/CommandLineParser.java      |    9 +-
 .../uima/internal/util/Common_hash_support.java    | 1103 +--
 .../uima/internal/util/ComparableFSIterator.java   |   80 +-
 .../uima/internal/util/CopyOnWriteObjHashSet.java  |  407 +-
 .../util/CopyOnWriteOrderedFsSet_array.java        |  309 +-
 .../uima/internal/util/EncodedPrintStream.java     |   10 +-
 .../org/apache/uima/internal/util/I18nUtil.java    |   33 +-
 .../org/apache/uima/internal/util/I18nx_impl.java  |  556 +-
 .../util/InstrumentationFacility_impl.java         |    7 +-
 .../internal/util/Int2IntArrayMapFixedSize.java    |  149 +-
 .../apache/uima/internal/util/Int2ObjHashMap.java  | 1215 ++-
 .../apache/uima/internal/util/Int2ObjListMap.java  |  133 +-
 .../apache/uima/internal/util/IntArrayUtils.java   |   30 +-
 .../org/apache/uima/internal/util/IntBitSet.java   |  646 +-
 .../apache/uima/internal/util/IntComparator.java   |    6 +-
 .../org/apache/uima/internal/util/IntHashSet.java  | 2088 ++---
 .../uima/internal/util/IntKeyValueIterator.java    |    2 +-
 .../apache/uima/internal/util/IntListIterator.java |   18 +-
 .../uima/internal/util/IntPointerIterator.java     |    4 +-
 .../java/org/apache/uima/internal/util/IntSet.java |   65 +-
 .../org/apache/uima/internal/util/IntStack.java    |   20 +-
 .../org/apache/uima/internal/util/IntVector.java   |  246 +-
 .../org/apache/uima/internal/util/JavaTimer.java   |    9 +-
 .../apache/uima/internal/util/JmxMBeanAgent.java   |  102 +-
 .../java/org/apache/uima/internal/util/Misc.java   | 2601 +++---
 .../internal/util/MsgLocalizationClassLoader.java  |  445 +-
 .../uima/internal/util/Obj2IntIdentityHashMap.java | 1184 +--
 .../org/apache/uima/internal/util/ObjHashSet.java  | 1404 ++--
 .../uima/internal/util/OrderedFsSet_array.java     | 1407 ++--
 .../uima/internal/util/OrderedFsSet_array2.java    | 4335 +++++-----
 .../java/org/apache/uima/internal/util/Pair.java   |  160 +-
 .../apache/uima/internal/util/PositiveIntSet.java  |  285 +-
 .../uima/internal/util/PositiveIntSet_impl.java    | 1524 ++--
 .../uima/internal/util/ReplaceStringInFiles.java   |   24 +-
 .../apache/uima/internal/util/ResourcePool.java    |   19 +-
 .../uima/internal/util/SerializationUtils.java     |   18 +-
 .../apache/uima/internal/util/SortedIntSet.java    |   19 +-
 .../apache/uima/internal/util/StringToIntMap.java  |    9 +-
 .../org/apache/uima/internal/util/StringUtils.java |   15 +-
 .../org/apache/uima/internal/util/SymbolTable.java |    5 +-
 .../uima/internal/util/TextAnalysisEnginePool.java |    9 +-
 .../uima/internal/util/TextStringTokenizer.java    |   16 +-
 .../apache/uima/internal/util/TextTokenizer.java   |   60 +-
 .../org/apache/uima/internal/util/TimeSpan.java    |   17 +-
 .../java/org/apache/uima/internal/util/Timer.java  |    1 -
 .../apache/uima/internal/util/UIMAClassLoader.java |  137 +-
 .../uima/internal/util/UIMALogFormatter.java       |    3 +-
 .../uima/internal/util/UIMAStreamHandler.java      |    1 +
 .../org/apache/uima/internal/util/UtilError.java   |    6 +-
 .../org/apache/uima/internal/util/Utilities.java   |   70 +-
 .../apache/uima/internal/util/WeakIdentityMap.java |  125 +-
 .../org/apache/uima/internal/util/XMLUtils.java    |  328 +-
 .../apache/uima/internal/util/XmlAttribute.java    |    2 +-
 .../apache/uima/internal/util/XmlElementName.java  |   12 +-
 .../internal/util/XmlElementNameAndContents.java   |   11 +-
 .../uima/internal/util/function/Consumer2.java     |   48 +-
 .../util/function/Consumer_T_withIOException.java  |   52 +-
 .../util/function/Consumer_withSaxException.java   |   52 +-
 .../internal/util/function/DeserBinaryIndexes.java |   52 +-
 .../util/function/IntConsumer_withIOException.java |   52 +-
 .../util/function/Runnable_withException.java      |   48 +-
 .../util/function/Runnable_withSaxException.java   |   52 +-
 .../uima/internal/util/function/package-info.java  |   48 +-
 .../internal/util/rb_trees/CompIntArrayRBT.java    |   11 +-
 .../uima/internal/util/rb_trees/Int2IntRBT.java    |  180 +-
 .../uima/internal/util/rb_trees/IntArrayRBT.java   |  464 +-
 .../internal/util/rb_trees/IntArrayRBTcommon.java  | 1628 ++--
 .../uima/internal/util/rb_trees/IntRBTArray.java   |   27 +-
 .../uima/internal/util/rb_trees/IntRBTNode.java    |    9 +-
 .../internal/util/rb_trees/IntRedBlackTree.java    |   13 +-
 .../uima/internal/util/rb_trees/RBTNode.java       |   19 +-
 .../uima/internal/util/rb_trees/RedBlackTree.java  |   23 +-
 .../src/main/java/org/apache/uima/jcas/JCas.java   |  628 +-
 .../java/org/apache/uima/jcas/JCasRegistry.java    |  117 +-
 .../org/apache/uima/jcas/JFSIndexRepository.java   |   36 +-
 .../org/apache/uima/jcas/cas/AnnotationBase.java   |   85 +-
 .../apache/uima/jcas/cas/AnnotationBase_Type.java  |  166 +-
 .../java/org/apache/uima/jcas/cas/ArrayFSImpl.java |   64 +-
 .../org/apache/uima/jcas/cas/BooleanArray.java     |   77 +-
 .../java/org/apache/uima/jcas/cas/ByteArray.java   |   77 +-
 .../java/org/apache/uima/jcas/cas/CommonList.java  |  659 +-
 .../apache/uima/jcas/cas/CommonPrimitiveArray.java |   85 +-
 .../java/org/apache/uima/jcas/cas/DoubleArray.java |   86 +-
 .../java/org/apache/uima/jcas/cas/EmptyFSList.java |   19 +-
 .../org/apache/uima/jcas/cas/EmptyFloatList.java   |   15 +-
 .../org/apache/uima/jcas/cas/EmptyIntegerList.java |   15 +-
 .../java/org/apache/uima/jcas/cas/EmptyList.java   |   55 +-
 .../org/apache/uima/jcas/cas/EmptyStringList.java  |   15 +-
 .../java/org/apache/uima/jcas/cas/FSArray.java     |  164 +-
 .../java/org/apache/uima/jcas/cas/FSArrayList.java |    4 +-
 .../java/org/apache/uima/jcas/cas/FSHashSet.java   |    4 +-
 .../org/apache/uima/jcas/cas/FSLinkedHashSet.java  |    4 +-
 .../main/java/org/apache/uima/jcas/cas/FSList.java |  153 +-
 .../java/org/apache/uima/jcas/cas/FloatArray.java  |   85 +-
 .../java/org/apache/uima/jcas/cas/FloatList.java   |   82 +-
 .../main/java/org/apache/uima/jcas/cas/Int2FS.java |  264 +-
 .../org/apache/uima/jcas/cas/IntegerArray.java     |   84 +-
 .../org/apache/uima/jcas/cas/IntegerArrayList.java |    4 +-
 .../java/org/apache/uima/jcas/cas/IntegerList.java |   75 +-
 .../java/org/apache/uima/jcas/cas/LongArray.java   |   90 +-
 .../org/apache/uima/jcas/cas/NonEmptyFSList.java   |  109 +-
 .../apache/uima/jcas/cas/NonEmptyFloatList.java    |  100 +-
 .../apache/uima/jcas/cas/NonEmptyIntegerList.java  |  105 +-
 .../org/apache/uima/jcas/cas/NonEmptyList.java     |   51 +-
 .../apache/uima/jcas/cas/NonEmptyStringList.java   |  106 +-
 .../apache/uima/jcas/cas/SelectViaCopyToArray.java |  191 +-
 .../java/org/apache/uima/jcas/cas/ShortArray.java  |   70 +-
 .../main/java/org/apache/uima/jcas/cas/Sofa.java   |  321 +-
 .../java/org/apache/uima/jcas/cas/StringArray.java |   69 +-
 .../java/org/apache/uima/jcas/cas/StringList.java  |   53 +-
 .../main/java/org/apache/uima/jcas/cas/TOP.java    |   72 +-
 .../java/org/apache/uima/jcas/cas/TOP_Type.java    |  430 +-
 .../org/apache/uima/jcas/impl/JCasHashMap.java     |  297 +-
 .../apache/uima/jcas/impl/JCasHashMapSubMap.java   | 1442 ++--
 .../java/org/apache/uima/jcas/impl/JCasImpl.java   |  751 +-
 .../uima/jcas/impl/JFSIndexRepositoryImpl.java     |   20 +-
 .../java/org/apache/uima/jcas/tcas/Annotation.java |  193 +-
 .../org/apache/uima/jcas/tcas/Annotation_Type.java |  275 +-
 .../uima/pear/tools/InstallationController.java    |  411 +-
 .../uima/pear/tools/InstallationDescriptor.java    |   94 +-
 .../pear/tools/InstallationDescriptorHandler.java  |   20 +-
 .../uima/pear/tools/InstallationProcessor.java     |   44 +-
 .../apache/uima/pear/tools/InstallationTester.java |  346 +-
 .../uima/pear/tools/LocalInstallationAgent.java    |   34 +-
 .../org/apache/uima/pear/tools/PackageBrowser.java |   80 +-
 .../org/apache/uima/pear/tools/PackageCreator.java |   40 +-
 .../uima/pear/tools/PackageCreatorException.java   |   16 +-
 .../apache/uima/pear/tools/PackageInstaller.java   |  459 +-
 .../uima/pear/tools/PackageInstallerException.java |   19 +-
 .../apache/uima/pear/tools/PackageSelectorGUI.java |    7 +
 .../uima/pear/tools/SimplePackageSelector.java     |   15 +-
 .../java/org/apache/uima/pear/util/FileUtil.java   |  145 +-
 .../org/apache/uima/pear/util/MessageRouter.java   |   26 +-
 .../org/apache/uima/pear/util/ProcessUtil.java     |   46 +-
 .../java/org/apache/uima/pear/util/StringUtil.java |    4 +-
 .../java/org/apache/uima/pear/util/UIMAUtil.java   |   52 +-
 .../java/org/apache/uima/pear/util/XMLUtil.java    |  179 +-
 .../org/apache/uima/resource/CasDefinition.java    |   25 +-
 .../java/org/apache/uima/resource/CasManager.java  |   59 +-
 .../ConfigurableDataResourceSpecifier.java         |    8 +-
 .../apache/uima/resource/ConfigurableResource.java |   53 +-
 .../resource/ConfigurableResource_ImplBase.java    |   13 +-
 .../apache/uima/resource/ConfigurationManager.java |   54 +-
 .../uima/resource/CustomResourceSpecifier.java     |   37 +-
 .../org/apache/uima/resource/DataResource.java     |   34 +-
 .../uima/resource/ExternalResourceDependency.java  |   22 +-
 .../uima/resource/ExternalResourceDescription.java |   21 +-
 .../resource/FileLanguageResourceSpecifier.java    |   11 +-
 .../uima/resource/FileResourceSpecifier.java       |    8 +-
 .../uima/resource/JMSMessagingSpecifier.java       |   19 +-
 .../apache/uima/resource/MQMessagingSpecifier.java |    9 +-
 .../uima/resource/MailMessagingSpecifier.java      |   17 +-
 .../org/apache/uima/resource/ManagementObject.java |   14 +-
 .../apache/uima/resource/MessagingSpecifier.java   |   41 +-
 .../uima/resource/ParameterizedDataResource.java   |    2 +-
 .../org/apache/uima/resource/PearSpecifier.java    |   42 +-
 .../apache/uima/resource/RelativePathResolver.java |   10 +-
 .../java/org/apache/uima/resource/Resource.java    |   91 +-
 .../uima/resource/ResourceAccessException.java     |   20 +-
 .../resource/ResourceConfigurationException.java   |   39 +-
 .../uima/resource/ResourceCreationSpecifier.java   |  108 +-
 .../resource/ResourceInitializationException.java  |   79 +-
 .../org/apache/uima/resource/ResourceManager.java  |  244 +-
 .../uima/resource/ResourceManagerPearWrapper.java  |   88 +-
 .../uima/resource/ResourceProcessException.java    |   17 +-
 .../uima/resource/ResourceServiceException.java    |   17 +-
 .../uima/resource/ResourceServiceSpecifier.java    |    4 +-
 .../apache/uima/resource/ResourceServiceStub.java  |    7 +-
 .../uima/resource/ResourceSpecifierList.java       |   12 +-
 .../apache/uima/resource/Resource_ImplBase.java    |   89 +-
 .../java/org/apache/uima/resource/Session.java     |   18 +-
 .../apache/uima/resource/SharedResourceObject.java |    9 +-
 .../org/apache/uima/resource/URISpecifier.java     |   28 +-
 .../apache/uima/resource/impl/CasManager_impl.java |  182 +-
 .../ConfigurableDataResourceSpecifier_impl.java    |   13 +-
 .../impl/ConfigurableDataResource_impl.java        |    7 +
 .../impl/ConfigurationManagerImplBase.java         |  108 +-
 .../resource/impl/ConfigurationManager_impl.java   |   49 +-
 .../impl/CustomResourceSpecifier_impl.java         |   44 +-
 .../uima/resource/impl/DataResource_impl.java      |   40 +-
 .../impl/ExternalResourceDependency_impl.java      |   16 +-
 .../impl/ExternalResourceDescription_impl.java     |   20 +-
 .../impl/FileLanguageResourceSpecifier_impl.java   |    9 +-
 .../resource/impl/FileLanguageResource_impl.java   |   15 +-
 .../resource/impl/FileResourceSpecifier_impl.java  |   15 +-
 .../apache/uima/resource/impl/Parameter_impl.java  |    7 +
 .../uima/resource/impl/PearSpecifier_impl.java     |   14 +-
 .../resource/impl/RelativePathResolver_impl.java   |   15 +-
 .../impl/ResourceCreationSpecifier_impl.java       |   71 +-
 .../uima/resource/impl/ResourceManager_impl.java   |  421 +-
 .../resource/impl/SessionNamespaceView_impl.java   |    3 +-
 .../apache/uima/resource/impl/Session_impl.java    |    3 +-
 .../uima/resource/impl/URISpecifier_impl.java      |   11 +
 .../uima/resource/metadata/AllowedValue.java       |    8 +-
 .../apache/uima/resource/metadata/Capability.java  |   65 +-
 .../uima/resource/metadata/ConfigurationGroup.java |   19 +-
 .../resource/metadata/ConfigurationParameter.java  |   57 +-
 .../ConfigurationParameterDeclarations.java        |   55 +-
 .../metadata/ConfigurationParameterSettings.java   |   30 +-
 .../resource/metadata/ExternalResourceBinding.java |   11 +-
 .../uima/resource/metadata/FeatureDescription.java |   20 +-
 .../uima/resource/metadata/FsIndexCollection.java  |   10 +-
 .../uima/resource/metadata/FsIndexDescription.java |   25 +-
 .../resource/metadata/FsIndexKeyDescription.java   |   20 +-
 .../org/apache/uima/resource/metadata/Import.java  |   12 +-
 .../resource/metadata/LanguagePrecondition.java    |   21 +-
 .../uima/resource/metadata/MetaDataObject.java     |   48 +-
 .../resource/metadata/MimeTypePrecondition.java    |   14 +-
 .../uima/resource/metadata/NameValuePair.java      |    8 +-
 .../resource/metadata/OperationalProperties.java   |   14 +-
 .../uima/resource/metadata/Precondition.java       |   14 +-
 .../metadata/ProcessingResourceMetaData.java       |   46 +-
 .../metadata/ResourceManagerConfiguration.java     |   52 +-
 .../uima/resource/metadata/ResourceMetaData.java   |   38 +-
 .../uima/resource/metadata/SimplePrecondition.java |   58 +-
 .../uima/resource/metadata/TypeDescription.java    |   34 +-
 .../uima/resource/metadata/TypePriorities.java     |    9 +-
 .../uima/resource/metadata/TypePriorityList.java   |   11 +-
 .../resource/metadata/TypeSystemDescription.java   |    3 +-
 .../resource/metadata/impl/AllowedValue_impl.java  |    5 +
 .../resource/metadata/impl/Capability_impl.java    |   35 +-
 .../metadata/impl/ConfigurationGroup_impl.java     |   24 +-
 .../ConfigurationParameterDeclarations_impl.java   |   41 +-
 .../impl/ConfigurationParameterSettings_impl.java  |   55 +-
 .../metadata/impl/ConfigurationParameter_impl.java |   48 +-
 .../impl/ExternalResourceBinding_impl.java         |   13 +-
 .../metadata/impl/FeatureDescription_impl.java     |   15 +-
 .../metadata/impl/FsIndexCollection_impl.java      |   12 +-
 .../metadata/impl/FsIndexDescription_impl.java     |   11 +-
 .../metadata/impl/FsIndexKeyDescription_impl.java  |   42 +-
 .../uima/resource/metadata/impl/Import_impl.java   |   60 +-
 .../metadata/impl/LanguagePrecondition_impl.java   |   37 +-
 .../impl/MetaDataObjectSerializer_indent.java      |  919 +--
 .../impl/MetaDataObjectSerializer_plain.java       |  292 +-
 .../metadata/impl/MetaDataObject_impl.java         |  752 +-
 .../metadata/impl/MimeTypePrecondition_impl.java   |   38 +-
 .../resource/metadata/impl/NameValuePair_impl.java |   11 +-
 .../metadata/impl/OperationalProperties_impl.java  |   33 +-
 .../impl/ProcessingResourceMetaData_impl.java      |    5 +-
 .../resource/metadata/impl/PropertyXmlInfo.java    |   14 +-
 .../impl/ResourceManagerConfiguration_impl.java    |  103 +-
 .../metadata/impl/ResourceMetaData_impl.java       |   54 +-
 .../metadata/impl/SimplePrecondition_impl.java     |   29 +-
 .../metadata/impl/TypeDescription_impl.java        |   20 +-
 .../metadata/impl/TypePriorities_impl.java         |   37 +-
 .../metadata/impl/TypePriorityList_impl.java       |   19 +-
 .../service/impl/ResourceServiceAdapter.java       |   10 +-
 .../service/impl/ResourceService_impl.java         |   11 +-
 .../java/org/apache/uima/search/Attribute.java     |    8 +-
 .../main/java/org/apache/uima/search/Filter.java   |   10 +-
 .../org/apache/uima/search/IndexBuildItem.java     |   36 +-
 .../uima/search/IndexBuildSpecification.java       |   24 +-
 .../java/org/apache/uima/search/IndexRule.java     |    4 +-
 .../org/apache/uima/search/IndexingException.java  |   17 +-
 .../main/java/org/apache/uima/search/Mapping.java  |    8 +-
 .../main/java/org/apache/uima/search/Style.java    |   43 +-
 .../apache/uima/search/impl/Attribute_impl.java    |    7 +
 .../org/apache/uima/search/impl/Filter_impl.java   |   15 +-
 .../uima/search/impl/IndexBuildItem_impl.java      |    7 +
 .../search/impl/IndexBuildSpecification_impl.java  |   14 +-
 .../apache/uima/search/impl/IndexRule_impl.java    |    3 +
 .../org/apache/uima/search/impl/Mapping_impl.java  |   12 +-
 .../org/apache/uima/search/impl/Style_impl.java    |   12 +-
 .../org/apache/uima/uimacpp/CppUimajEngine.java    |   20 +-
 .../uima/uimacpp/UimacppAnalysisComponent.java     |  131 +-
 .../org/apache/uima/uimacpp/UimacppEngine.java     |   78 +-
 .../org/apache/uima/uimacpp/UimacppException.java  |    6 +-
 .../util/AnalysisEnginePerformanceReports.java     |    1 +
 .../org/apache/uima/util/AnalysisEngineUtils.java  |    2 +-
 .../apache/uima/util/AutoCloseableNoException.java |   68 +-
 .../main/java/org/apache/uima/util/CasCopier.java  | 1135 +--
 .../org/apache/uima/util/CasCreationUtils.java     |  907 ++-
 .../main/java/org/apache/uima/util/CasIOUtils.java |  399 +-
 .../java/org/apache/uima/util/CasLoadMode.java     |  207 +-
 .../main/java/org/apache/uima/util/CasPool.java    |  126 +-
 .../org/apache/uima/util/CasPoolManagement.java    |   25 +-
 .../java/org/apache/uima/util/CasToInlineXml.java  |   83 +-
 .../uima/util/ConcurrentHashMapWithProducer.java   |  130 +-
 .../org/apache/uima/util/ConsumerCasUtils.java     |    6 +-
 .../main/java/org/apache/uima/util/FileUtils.java  |   46 +-
 .../apache/uima/util/InstrumentationFacility.java  |   12 +-
 .../main/java/org/apache/uima/util/IntEntry.java   |  175 +-
 .../org/apache/uima/util/InvalidXMLException.java  |   27 +-
 .../java/org/apache/uima/util/IteratorNvc.java     |   69 +-
 .../main/java/org/apache/uima/util/JCasPool.java   |    1 +
 .../src/main/java/org/apache/uima/util/Level.java  |    7 +-
 .../src/main/java/org/apache/uima/util/Logger.java |  297 +-
 .../org/apache/uima/util/LoggerPrintStream.java    |   23 +
 .../java/org/apache/uima/util/MessageReport.java   |  122 +-
 .../src/main/java/org/apache/uima/util/Misc.java   |   96 +-
 .../java/org/apache/uima/util/NameClassPair.java   |   11 +-
 .../java/org/apache/uima/util/ProcessTrace.java    |   30 +-
 .../org/apache/uima/util/ProcessTraceEvent.java    |   29 +-
 .../main/java/org/apache/uima/util/Progress.java   |   19 +-
 .../java/org/apache/uima/util/ProgressImpl.java    |    6 +
 .../java/org/apache/uima/util/SaxDeserializer.java |    2 +-
 .../main/java/org/apache/uima/util/Settings.java   |   89 +-
 .../apache/uima/util/SimpleResourceFactory.java    |   48 +-
 .../java/org/apache/uima/util/TCasFormatter.java   |    4 +-
 .../java/org/apache/uima/util/TCasToInlineXml.java |   30 +-
 .../java/org/apache/uima/util/TypeSystemUtil.java  |   19 +-
 .../main/java/org/apache/uima/util/UimaTimer.java  |   14 +-
 .../main/java/org/apache/uima/util/UriUtils.java   |  173 +-
 .../java/org/apache/uima/util/XMLInputSource.java  |   36 +-
 .../main/java/org/apache/uima/util/XMLParser.java  |  120 +-
 .../java/org/apache/uima/util/XMLSerializer.java   |  285 +-
 .../main/java/org/apache/uima/util/XMLizable.java  |   43 +-
 .../org/apache/uima/util/XmlCasDeserializer.java   |   23 +-
 .../org/apache/uima/util/XmlCasSerializer.java     |    2 +-
 .../uima/util/impl/CasPoolManagementImpl.java      |   37 +-
 .../uima/util/impl/CasPoolManagementImplMBean.java |   22 +-
 .../java/org/apache/uima/util/impl/Constants.java  |   84 +-
 .../java/org/apache/uima/util/impl/DataIO.java     |  224 +-
 .../apache/uima/util/impl/JSR47Logger_impl.java    |  123 +-
 .../apache/uima/util/impl/Log4jLogger_impl.java    |  566 +-
 .../apache/uima/util/impl/Logger_common_impl.java  |  523 +-
 .../org/apache/uima/util/impl/Logger_impl.java     |   53 +-
 .../org/apache/uima/util/impl/OptimizeStrings.java |  184 +-
 .../uima/util/impl/ProcessTraceEvent_impl.java     |   31 +-
 .../apache/uima/util/impl/ProcessTrace_impl.java   |   73 +-
 .../uima/util/impl/SaxDeserializer_impl.java       |   95 +-
 .../uima/util/impl/SerializationMeasures.java      |  336 +-
 .../org/apache/uima/util/impl/Settings_impl.java   |  162 +-
 .../org/apache/uima/util/impl/XMLParser_impl.java  |  250 +-
 .../org/apache/uima/impl/UimaVersion.java          |  138 +-
 uimaj-core/src/test/java/aa/AbstractType.java      |    5 +-
 uimaj-core/src/test/java/aa/ConcreteType.java      |    5 +-
 .../src/test/java/aa/MissingFeatureInCas.java      |    5 +-
 uimaj-core/src/test/java/aa/MissingInCas.java      |    5 +-
 uimaj-core/src/test/java/aa/Root.java              |    5 +-
 uimaj-core/src/test/java/aa/T.java                 |    6 +-
 .../test/java/org/apache/lang/LanguagePair.java    |    6 +-
 .../uima/ae/multiplier/SimpleCasGenerator.java     |  336 +-
 .../org/apache/uima/ae/noop/NoOpAnnotator.java     |  284 +-
 .../impl/AnalysisEngineDescription_implTest.java   |  192 +-
 .../impl/AnalysisEngineManagementImplTest.java     |  135 +-
 .../impl/AnalysisEngine_implTest.java              |  642 +-
 .../analysis_engine/impl/AnnotationWriter.java     |   24 +-
 .../impl/AnnotatorContext_implTest.java            |   70 +-
 .../AnnotatorForCollectionProcessCompleteTest.java |   28 +-
 .../impl/AnnotatorMissingSuper.java                |  127 +-
 .../uima/analysis_engine/impl/BadSegmenter.java    |    6 +-
 .../uima/analysis_engine/impl/ErrorAnnotator.java  |    3 +-
 .../impl/FlowControllerForErrorTest.java           |   39 +-
 .../analysis_engine/impl/MultiViewAnnotator.java   |    4 +-
 .../MultiprocessingAnalysisEngine_implTest.java    |  244 +-
 .../analysis_engine/impl/NewlineResegmenter.java   |    9 +-
 .../analysis_engine/impl/NewlineSegmenter.java     |    6 +-
 .../impl/ParallelFlowController.java               |   32 +-
 .../impl/PearAnalysisEngineWrapperTest.java        |   36 +-
 .../uima/analysis_engine/impl/ResultSpecTest.java  |  407 +-
 .../impl/ResultSpecWithTypeSystemTest.java         |  510 +-
 .../impl/ResultSpecification_implTest.java         |  104 +-
 .../impl/SegmentDroppingFlowController.java        |    9 +-
 .../uima/analysis_engine/impl/TabSegmenter.java    |    4 +-
 .../impl/TaeDescription_implTest.java              |   48 +-
 .../uima/analysis_engine/impl/TestAnnotator.java   |    2 +
 .../uima/analysis_engine/impl/TestAnnotator2.java  |   62 +-
 .../impl/metadata/MetaDataObjectAssert.java        |    7 +-
 .../impl/metadata/SofaMapping_implTest.java        |   19 +-
 .../sequencer/SequencerCapabilityLanguageTest.java |   48 +-
 .../impl/sequencer/SequencerFixedTest.java         |  100 +-
 .../impl/sequencer/SequencerTestAnnotator.java     |  145 +-
 .../uima/cas/impl/AnnotationIteratorTest.java      |  938 ++-
 .../uima/cas/impl/BinaryCasSerDesPerformance.java  |  163 +-
 .../java/org/apache/uima/cas/impl/CasPoolTest.java |  125 +-
 .../uima/cas/impl/CasTypeSystemMapperTest.java     |  605 +-
 .../apache/uima/cas/impl/ComponentInfoTest.java    |   33 +-
 .../impl/ConcurrentBinarySerializationTest.java    |  150 +-
 .../uima/cas/impl/CustomSerializationTest.java     |  211 +-
 .../org/apache/uima/cas/impl/FSBagIndexTest.java   |  240 +-
 .../java/org/apache/uima/cas/impl/FSIndexTest.java |   16 +-
 .../org/apache/uima/cas/impl/FeaturePathTest.java  | 1566 ++--
 .../java/org/apache/uima/cas/impl/Id2FSTest.java   |  228 +-
 .../cas/impl/IndexCorruptionReportingTest.java     |  179 +-
 .../org/apache/uima/cas/impl/JCasReinitTest.java   |  188 +-
 .../uima/cas/impl/OrderedFsSet_array_Test.java     |  434 +-
 .../org/apache/uima/cas/impl/ProtectIndexTest.java |   38 +-
 .../org/apache/uima/cas/impl/SelectFsAssert.java   |  688 +-
 .../apache/uima/cas/impl/SelectFsNoJCasTest.java   |   32 +-
 .../cas/impl/SelectFsPredicateAlignmentTest.java   |  547 +-
 .../org/apache/uima/cas/impl/SelectFsTest.java     | 3648 +++++----
 .../org/apache/uima/cas/impl/SerDesForm4Test.java  |  851 +-
 .../apache/uima/cas/impl/SerDesForm6ExtraTest.java |   28 +-
 .../org/apache/uima/cas/impl/SerDesForm6Test.java  |  626 +-
 .../org/apache/uima/cas/impl/SerDesTstCommon.java  |  487 +-
 .../uima/cas/impl/UimaV2CasCompatibilityTest.java  |   14 +-
 .../uima/cas/impl/UnambiguousIteratorTest.java     |   16 +-
 .../apache/uima/cas/impl/XCASDeserializerTest.java |  231 +-
 .../uima/cas/impl/XmiCasDeserializerTest.java      | 2042 ++---
 .../apache/uima/cas/impl/XmiCasSerializerTest.java |   70 +-
 .../java/org/apache/uima/cas/impl/XmiCompare.java  | 1062 +--
 ...rializationDeserialization_BINARY_TSI_Test.java |  112 +
 ...asSerializationDeserialization_BINARY_Test.java |  108 +
 ...serialization_COMPRESSED_FILTERED_TSI_Test.java |  113 +
 ...izationDeserialization_SERIALIZED_TSI_Test.java |  111 +
 .../CasSerializationDeserialization_XCAS_Test.java |  128 +
 ...izationDeserialization_XMI_1_0_PRETTY_Test.java |  147 +
 ...izationDeserialization_XMI_1_1_PRETTY_Test.java |  120 +
 .../uima/cas/serdes/CasToComparableText.java       | 1004 +++
 .../uima/cas/serdes/CasToComparableTextTest.java   |  202 +
 .../apache/uima/cas/serdes/SerDesAssuptions.java   |   33 +
 .../uima/cas/serdes/SerDesCasIOTestUtils.java      |  310 +
 .../java/org/apache/uima/cas/serdes/TestType.java  |  101 +
 .../uima/cas/serdes/datasuites/CasDataSuite.java   |   26 +
 .../datasuites/MultiFeatureRandomCasDataSuite.java |  110 +
 .../datasuites/MultiTypeRandomCasDataSuite.java    |  122 +
 .../ProgrammaticallyCreatedCasDataSuite.java       |  411 +
 .../cas/serdes/datasuites/XmiFileDataSuite.java    |  105 +
 ...SuiteTypeSystemDescriptionMinimizationTool.java |  162 +
 .../cas/serdes/generators/CasConfiguration.java    |   50 +
 .../uima/cas/serdes/generators/CasGenerator.java   |   31 +
 .../generators/MultiFeatureRandomCasGenerator.java |  457 ++
 .../generators/MultiTypeRandomCasGenerator.java    |  194 +
 .../cas/serdes/scenario/DesSerTestScenario.java    |  180 +
 .../cas/serdes/scenario/SerDesTestScenario.java    |  116 +
 .../cas/serdes/scenario/SerRefTestScenario.java    |  188 +
 .../transitions/CasDesSerCycleConfiguration.java   |   48 +
 .../transitions/CasSerDesCycleConfiguration.java   |   47 +
 .../transitions/CasSourceTargetConfiguration.java  |  111 +
 .../apache/uima/cas/test/AnnotationIndexTest.java  |  662 +-
 .../apache/uima/cas/test/AnnotationTreeTest.java   |   22 +-
 .../java/org/apache/uima/cas/test/ArrayFSTest.java |   38 +-
 .../org/apache/uima/cas/test/ArrayIndexTest.java   |   52 +-
 .../org/apache/uima/cas/test/CASInitializer.java   |   18 +-
 .../java/org/apache/uima/cas/test/CASTest.java     |   64 +-
 .../org/apache/uima/cas/test/CASTestSetup.java     |   36 +-
 .../uima/cas/test/CompleteSerializationTest.java   |   32 +-
 .../org/apache/uima/cas/test/CrossAnnotation.java  |    5 +-
 .../org/apache/uima/cas/test/EnrichedEntity.java   |    4 +-
 .../uima/cas/test/FSCreatedInPearContextTest.java  |    9 +-
 .../java/org/apache/uima/cas/test/FeatureMap.java  |    2 +-
 .../org/apache/uima/cas/test/FeatureRecord.java    |    4 +-
 .../apache/uima/cas/test/FeatureStructureTest.java |  878 +-
 .../apache/uima/cas/test/FilteredIteratorTest.java |  117 +-
 .../org/apache/uima/cas/test/FloatArrayFSTest.java |  226 +-
 .../apache/uima/cas/test/GetAllIndexedTest.java    |   89 +-
 .../cas/test/GrowingTheCasNoJcasCacheTest.java     |   54 +-
 .../apache/uima/cas/test/GrowingTheCasTest.java    |  316 +-
 .../apache/uima/cas/test/IndexComparitorTest.java  |  108 +-
 .../uima/cas/test/IndexRepositoryMergingTest.java  |  233 +-
 .../apache/uima/cas/test/IndexRepositoryTest.java  |  170 +-
 .../uima/cas/test/IndexSerializationTest.java      |   39 +-
 .../org/apache/uima/cas/test/IntArrayFSTest.java   |   26 +-
 .../apache/uima/cas/test/IteratorSortedTest.java   |  715 +-
 .../org/apache/uima/cas/test/IteratorTest.java     |  707 +-
 .../apache/uima/cas/test/JCasClassLoaderTest.java  |  282 +-
 .../org/apache/uima/cas/test/JcasSofaTest.java     |  115 +-
 .../java/org/apache/uima/cas/test/Level_1.java     |  268 +-
 .../java/org/apache/uima/cas/test/Level_2.java     |  182 +-
 .../java/org/apache/uima/cas/test/Level_3.java     |  182 +-
 .../java/org/apache/uima/cas/test/Level_4.java     |  182 +-
 .../java/org/apache/uima/cas/test/Level_5.java     |  182 +-
 .../java/org/apache/uima/cas/test/Level_6.java     |  182 +-
 .../uima/cas/test/NewPrimitiveTypesTest.java       |  178 +-
 .../java/org/apache/uima/cas/test/Sentence.java    |    6 +-
 .../uima/cas/test/SerializationNoMDTest.java       |   30 +-
 .../uima/cas/test/SerializationReinitTest.java     |  797 +-
 .../java/org/apache/uima/cas/test/SofaTest.java    |  200 +-
 .../org/apache/uima/cas/test/StringArrayTest.java  |   67 +-
 .../uima/cas/test/StringSubtypeAnnotation.java     |    6 +-
 .../apache/uima/cas/test/StringSubtypeTest.java    |   35 +-
 .../apache/uima/cas/test/SubiteratorAnnotator.java |    6 +-
 .../org/apache/uima/cas/test/SubiteratorTest.java  |   39 +-
 .../org/apache/uima/cas/test/TestAnnotator.java    |    8 +-
 .../test/java/org/apache/uima/cas/test/Token.java  |    6 +-
 .../org/apache/uima/cas/test/TypeOrderTest.java    |   98 +-
 .../org/apache/uima/cas/test/TypePriorityTest.java |   56 +-
 .../apache/uima/cas/test/TypeSystemReinitTest.java |   47 +-
 .../org/apache/uima/cas/test/TypeSystemTest.java   |   84 +-
 .../apache/uima/cas/test/TypeSystemUtilsTest.java  |   31 +-
 .../uima/cas/test/UimacppDeserializationTest.java  |   45 +-
 .../uima/cas/text/AnnotationPredicateAssert.java   |   56 +-
 .../uima/cas/text/AnnotationPredicateTestData.java |  160 +-
 .../uima/cas/text/AnnotationPredicatesTest.java    |  347 +-
 .../cas/text/AxiomaticAnnotationPredicates.java    |   19 +-
 .../org/apache/uima/cas_data/impl/CasComparer.java |  472 +-
 .../uima/cas_data/impl/CasDataToXCasTest.java      |   25 +-
 .../cas_data/impl/XCasToCasDataSaxHandlerTest.java |   71 +-
 .../impl/CasConsumerDescription_implTest.java      |   21 +-
 .../impl/CasInitializerDescription_implTest.java   |   16 +-
 .../impl/CollectionReaderDescription_implTest.java |   17 +-
 .../uima/examples/cpm/sofa/TransAnnotator.java     |    1 +
 .../impl/CapabilityLanguageFlowControllerTest.java |   26 +-
 .../uima/flow/impl/FixedFlowControllerTest.java    |  143 +-
 .../uima/impl/AnalysisEngineFactory_implTest.java  |   21 +-
 .../uima/impl/CasConsumerFactory_implTest.java     |   21 +-
 .../impl/CollectionReaderFactory_implTest.java     |   21 +-
 .../CustomResourceSpecifierFactory_implTest.java   |   37 +-
 .../org/apache/uima/impl/SomeCustomResource.java   |   17 +-
 .../org/apache/uima/impl/UimaContext_implTest.java |  112 +-
 .../uima/internal/util/AnalysisEnginePoolTest.java |   73 +-
 .../uima/internal/util/Int2ObjHashMapTest.java     |  274 +-
 .../apache/uima/internal/util/IntBitSetTest.java   |  338 +-
 .../uima/internal/util/IntHashSetPerfTest.java     |  382 +-
 .../apache/uima/internal/util/IntHashSetTest.java  |  504 +-
 .../apache/uima/internal/util/IntVectorTest.java   |  197 +-
 .../org/apache/uima/internal/util/MiscTest.java    |   88 +-
 .../uima/internal/util/MultiThreadUtils.java       |  746 +-
 .../uima/internal/util/MultiThreadUtilsTest.java   |   94 +
 .../internal/util/Obj2IntIdentityHashMapTest.java  |  305 +-
 .../apache/uima/internal/util/ObjHashSetTest.java  |  382 +-
 .../uima/internal/util/PositiveIntSetTest.java     |  823 +-
 .../uima/internal/util/ResourcePoolTest.java       |   52 +-
 .../uima/internal/util/UIMAClassLoaderTest.java    |   89 +-
 .../uima/internal/util/WeakIdentityMapTest.java    |  117 +-
 .../apache/uima/internal/util/XmlUtilsTest.java    |   32 +-
 .../internal/util/rb_trees/Int2IntRBTTest.java     |   59 +-
 .../internal/util/rb_trees/IntArrayRBTTest.java    |  214 +-
 .../uima/jcas/impl/JCasCoverClassLoadingTest.java  |   10 +-
 .../uima/jcas/impl/JCasHashMapCompareTest.java     |  434 +-
 .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 1156 +--
 .../org/apache/uima/jcas/tcas/AnnotationTest.java  |  285 +-
 .../org/apache/uima/jcas/test/CASInitializer.java  |    5 +-
 .../org/apache/uima/jcas/test/CASTestSetup.java    |   20 +-
 .../org/apache/uima/jcas/test/FSArrayListTest.java |  182 +-
 .../org/apache/uima/jcas/test/FSHashSetTest.java   |  236 +-
 .../uima/jcas/test/IntegerArrayListTest.java       |  180 +-
 .../java/org/apache/uima/jcas/test/JCasTest.java   | 1581 ++--
 .../java/org/apache/uima/jcas/test/JCasTest2.java  |  203 +-
 .../uima/pear/util/ComponentCategoryTest.java      |   33 +-
 .../apache/uima/pear/util/PearEncodingTest.java    |   33 +-
 .../util/PearInstallationVerificationTest.java     |   42 +-
 .../apache/uima/pear/util/PearInstallerTest.java   |   61 +-
 .../org/apache/uima/pear/util/PearRuntimeTest.java |  117 +-
 .../resource/ConfigurableResource_implTest.java    |   52 +-
 .../org/apache/uima/resource/TestCasConsumer.java  |    2 +-
 .../uima/resource/impl/CasManager_implTest.java    |   37 +-
 ...ConfigurableDataResourceSpecifier_implTest.java |   12 +-
 .../impl/ConfigurableDataResource_implTest.java    |   24 +-
 .../uima/resource/impl/DataResource_implTest.java  |   27 +-
 .../impl/FileLanguageResource_implTest.java        |   30 +-
 .../uima/resource/impl/PearSpecifier_implTest.java |   62 +-
 .../impl/RelativePathResolver_implTest.java        |   19 +-
 .../impl/ResourceCreationSpecifier_implTest.java   |    7 +-
 .../resource/impl/ResourceManager_implTest.java    |   87 +-
 .../resource/impl/TestResourceInterface_impl.java  |   17 +-
 .../uima/resource/impl/URISpecifier_implTest.java  |   16 +-
 ...onfigurationParameterDeclarations_implTest.java |   19 +-
 .../metadata/impl/FsIndexCollection_implTest.java  |   50 +-
 .../resource/metadata/impl/ImportResolverTest.java |   10 +-
 .../resource/metadata/impl/Import_implTest.java    |   49 +-
 .../metadata/impl/MetaDataObject_implTest.java     |   96 +-
 .../ResourceManagerConfiguration_implTest.java     |   55 +-
 .../resource/metadata/impl/TestFruitBagObject.java |   32 +-
 .../resource/metadata/impl/TestFruitObject.java    |   55 +-
 .../metadata/impl/TypePriorities_implTest.java     |   53 +-
 .../impl/TypeSystemDescription_implTest.java       |   15 +-
 .../impl/ResourceServiceAdapter_implTest.java      |   28 +-
 .../service/impl/ResourceService_implTest.java     |   23 +-
 .../service/impl/TestResourceServiceStub.java      |    4 +-
 .../uima/testTypeSystem_arrays/OfShorts.java       |    6 +-
 .../uima/testTypeSystem_arrays/OfStrings.java      |    6 +-
 .../java/org/apache/uima/util/CasCopierTest.java   |  186 +-
 .../org/apache/uima/util/CasCreationUtilsTest.java |  208 +-
 .../uima/util/CasIOUtilsAlwaysHoldOnTest.java      |   35 +-
 .../java/org/apache/uima/util/CasIOUtilsTest.java  |  177 +-
 .../org/apache/uima/util/CasToInlineXmlTest.java   |  104 +-
 .../org/apache/uima/util/CasWrapperForTstng.java   |  683 +-
 .../java/org/apache/uima/util/FileUtilsTest.java   |   24 +-
 .../test/java/org/apache/uima/util/LevelTest.java  |   20 +-
 .../org/apache/uima/util/TestCollectionReader.java |    5 +-
 .../org/apache/uima/util/TypeSystemUtilTest.java   |   30 +-
 .../apache/uima/util/UimaContextHolderTest.java    |    4 +-
 .../org/apache/uima/util/XMLSerializerTest.java    |  282 +-
 .../uima/util/impl/JSR47Logger_implTest.java       |   12 +-
 .../util/impl/Log4JLogger_implCapturingTest.java   |  186 +
 .../uima/util/impl/Log4jLogger_implTest.java       |   21 +-
 .../org/apache/uima/util/impl/Logger_implTest.java |  121 +-
 .../org/apache/uima/util/impl/LoggingTest.java     |   26 +-
 .../apache/uima/util/impl/OptimizeStringsTest.java |  121 +-
 .../uima/util/impl/ProcessTrace_implTest.java      |   26 +-
 .../util/impl/Slf4jLogger_implCapturingTest.java   |    6 +-
 .../apache/uima/util/impl/XMLParser_implTest.java  |  100 +-
 .../src/test/java/sofa/test/CrossAnnotation.java   |    4 +-
 uimaj-core/src/test/java/x/y/z/EndOfSentence.java  |    6 +-
 uimaj-core/src/test/java/x/y/z/Sentence.java       |    6 +-
 uimaj-core/src/test/java/x/y/z/Separator.java      |    6 +-
 uimaj-core/src/test/java/x/y/z/Token.java          |    6 +-
 uimaj-core/src/test/java/x/y/z/TokenType.java      |    6 +-
 uimaj-core/src/test/java/x/y/z/Word.java           |    6 +-
 .../one-way/cas_with_collections/cas.bin           |  Bin 0 -> 3742 bytes
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../one-way/cas_with_empty_array_reference/cas.bin |  Bin 0 -> 2619 bytes
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/cas.bin           |  Bin 0 -> 2825 bytes
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/cas.bin         |  Bin 0 -> 2746 bytes
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/cas.bin            |  Bin 0 -> 3286 bytes
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/cas.bin        |  Bin 0 -> 2562 bytes
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/cas.bin               |  Bin 0 -> 3158 bytes
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/cas.bin             |  Bin 0 -> 2708 bytes
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/cas.bin                      |  Bin 0 -> 2516 bytes
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/cas.bin                      |  Bin 0 -> 3045 bytes
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3430 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3371 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../cas.bin                                        |  Bin 0 -> 3351 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/cas.bin  |  Bin 0 -> 3525 bytes
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/cas.bin          |  Bin 0 -> 3169 bytes
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/cas.bin       |  Bin 0 -> 3325 bytes
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../one-way/tsv3-testMultiTokenSlotFeature/cas.bin |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../cas.bin                                        |  Bin 0 -> 3167 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3147 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/cas.bin  |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3215 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3171 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/cas.bin            |  Bin 0 -> 3317 bytes
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/cas.bin     |  Bin 0 -> 3143 bytes
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../one-way/tsv3-testSentenceWithLineBreak/cas.bin |  Bin 0 -> 3147 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/cas.bin       |  Bin 0 -> 3147 bytes
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/cas.bin           |  Bin 0 -> 3357 bytes
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../tsv3-testSimpleCrossSenenceSlotFeature/cas.bin |  Bin 0 -> 3619 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/cas.bin     |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/cas.bin     |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../cas.bin                                        |  Bin 0 -> 3391 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3386 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3304 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3286 bytes
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3304 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3352 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3352 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3328 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3328 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3222 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3288 bytes
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3206 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3147 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/cas.bin          |  Bin 0 -> 3469 bytes
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../cas.bin                                        |  Bin 0 -> 3450 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3506 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 3442 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3463 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 3935 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../cas.bin                                        |  Bin 0 -> 3471 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 3147 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3147 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3171 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/cas.bin        |  Bin 0 -> 2991 bytes
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/cas.bin      |  Bin 0 -> 3031 bytes
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/cas.bin         |  Bin 0 -> 3357 bytes
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../cas.bin                                        |  Bin 0 -> 4286 bytes
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/cas.bin      |  Bin 0 -> 3371 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../cas.bin                                        |  Bin 0 -> 3291 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3323 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3883 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3543 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3291 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3243 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/cas.bin  |  Bin 0 -> 3411 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3483 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 2969 bytes
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/cas.bin      |  Bin 0 -> 3349 bytes
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/cas.bin        |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/cas.bin        |  Bin 0 -> 3415 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2997 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3203 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3171 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3149 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3189 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/cas.bin  |  Bin 0 -> 2604 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/cas.bin      |  Bin 0 -> 2673 bytes
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../ser-ref/casWithFsList/cas.bin                  |  Bin 0 -> 3204 bytes
 .../ser-ref/casWithFsList/debug-typesystem.xml     |  117 +
 .../ser-ref/casWithFsList/debug.xmi                |   38 +
 .../casWithLeftToRightTextAndAnnotations/cas.bin   |  Bin 0 -> 2408 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/cas.bin           |  Bin 0 -> 2316 bytes
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/cas.bin             |  Bin 0 -> 2420 bytes
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/cas.bin                    |  Bin 0 -> 2376 bytes
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotation/cas.bin       |  Bin 0 -> 2396 bytes
 .../casWithTextAndAnnotation/debug-typesystem.xml  |   17 +
 .../ser-ref/casWithTextAndAnnotation/debug.xmi     |    7 +
 .../ser-ref/casWithTextAndAnnotations/cas.bin      |  Bin 0 -> 2456 bytes
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../cas.bin                                        |  Bin 0 -> 2440 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/cas.bin       |  Bin 0 -> 2344 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/cas.bin                       |  Bin 0 -> 2200 bytes
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/cas.bin           |  Bin 0 -> 1400 bytes
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../one-way/cas_with_empty_array_reference/cas.bin |  Bin 0 -> 416 bytes
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/cas.bin           |  Bin 0 -> 496 bytes
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/cas.bin         |  Bin 0 -> 356 bytes
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/cas.bin            |  Bin 0 -> 636 bytes
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/cas.bin        |  Bin 0 -> 356 bytes
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/cas.bin               |  Bin 0 -> 828 bytes
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/cas.bin             |  Bin 0 -> 580 bytes
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/cas.bin                      |  Bin 0 -> 388 bytes
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/cas.bin                      |  Bin 0 -> 816 bytes
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 576 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 708 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../cas.bin                                        |  Bin 0 -> 688 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/cas.bin  |  Bin 0 -> 604 bytes
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/cas.bin          |  Bin 0 -> 352 bytes
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/cas.bin       |  Bin 0 -> 540 bytes
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../one-way/tsv3-testMultiTokenSlotFeature/cas.bin |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../cas.bin                                        |  Bin 0 -> 504 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 484 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/cas.bin  |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 552 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 508 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/cas.bin            |  Bin 0 -> 704 bytes
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/cas.bin     |  Bin 0 -> 480 bytes
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../one-way/tsv3-testSentenceWithLineBreak/cas.bin |  Bin 0 -> 484 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/cas.bin       |  Bin 0 -> 484 bytes
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/cas.bin           |  Bin 0 -> 572 bytes
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../tsv3-testSimpleCrossSenenceSlotFeature/cas.bin |  Bin 0 -> 800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/cas.bin     |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/cas.bin     |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../cas.bin                                        |  Bin 0 -> 572 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 564 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 540 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 536 bytes
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 540 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 588 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 588 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 564 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 564 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 508 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 516 bytes
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 492 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 484 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/cas.bin          |  Bin 0 -> 684 bytes
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../cas.bin                                        |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 652 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 620 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 644 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 1272 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../cas.bin                                        |  Bin 0 -> 808 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 484 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 484 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 508 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/cas.bin        |  Bin 0 -> 328 bytes
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/cas.bin      |  Bin 0 -> 368 bytes
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/cas.bin         |  Bin 0 -> 572 bytes
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../cas.bin                                        |  Bin 0 -> 804 bytes
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/cas.bin      |  Bin 0 -> 708 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../cas.bin                                        |  Bin 0 -> 628 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 660 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 1220 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 880 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 628 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 580 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/cas.bin  |  Bin 0 -> 748 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 820 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 356 bytes
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/cas.bin      |  Bin 0 -> 524 bytes
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/cas.bin        |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/cas.bin        |  Bin 0 -> 596 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../cas.bin                                        |  Bin 0 -> 348 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 540 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 508 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 500 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 540 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 364 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/cas.bin  |  Bin 0 -> 476 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/cas.bin      |  Bin 0 -> 248 bytes
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../typesystem.xml                                 |   74 +
 .../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 +
 .../casWithLeftToRightTextAndAnnotations/cas.bin   |  Bin 0 -> 280 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/cas.bin           |  Bin 0 -> 188 bytes
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/cas.bin             |  Bin 0 -> 292 bytes
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/cas.bin                    |  Bin 0 -> 248 bytes
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotation/cas.bin       |  Bin 0 -> 268 bytes
 .../casWithTextAndAnnotation/debug-typesystem.xml  |   17 +
 .../ser-ref/casWithTextAndAnnotation/debug.xmi     |    7 +
 .../ser-ref/casWithTextAndAnnotations/cas.bin      |  Bin 0 -> 328 bytes
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../cas.bin                                        |  Bin 0 -> 312 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/cas.bin       |  Bin 0 -> 216 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/cas.bin                       |  Bin 0 -> 72 bytes
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/cas.bin           |  Bin 0 -> 2963 bytes
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../one-way/cas_with_empty_array_reference/cas.bin |  Bin 0 -> 2535 bytes
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/cas.bin           |  Bin 0 -> 2646 bytes
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/cas.bin         |  Bin 0 -> 2694 bytes
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/cas.bin            |  Bin 0 -> 3019 bytes
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/cas.bin        |  Bin 0 -> 2525 bytes
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/cas.bin               |  Bin 0 -> 2744 bytes
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/cas.bin             |  Bin 0 -> 2461 bytes
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/cas.bin                      |  Bin 0 -> 2457 bytes
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/cas.bin                      |  Bin 0 -> 2614 bytes
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../cas.bin                                        |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3013 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3180 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2998 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../cas.bin                                        |  Bin 0 -> 2990 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/cas.bin  |  Bin 0 -> 3256 bytes
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/cas.bin          |  Bin 0 -> 3107 bytes
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/cas.bin       |  Bin 0 -> 3099 bytes
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../one-way/tsv3-testMultiTokenSlotFeature/cas.bin |  Bin 0 -> 3153 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../cas.bin                                        |  Bin 0 -> 2977 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 2969 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/cas.bin  |  Bin 0 -> 3153 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2991 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 2973 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/cas.bin            |  Bin 0 -> 2949 bytes
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/cas.bin     |  Bin 0 -> 2970 bytes
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../one-way/tsv3-testSentenceWithLineBreak/cas.bin |  Bin 0 -> 2970 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/cas.bin       |  Bin 0 -> 2970 bytes
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/cas.bin           |  Bin 0 -> 3103 bytes
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../tsv3-testSimpleCrossSenenceSlotFeature/cas.bin |  Bin 0 -> 3172 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/cas.bin     |  Bin 0 -> 3148 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/cas.bin     |  Bin 0 -> 3151 bytes
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../cas.bin                                        |  Bin 0 -> 3145 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3148 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3080 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3065 bytes
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3079 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3087 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3085 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3083 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3082 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3030 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3091 bytes
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3023 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 2968 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/cas.bin          |  Bin 0 -> 3114 bytes
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../cas.bin                                        |  Bin 0 -> 3187 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3197 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 3161 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3162 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 3071 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../cas.bin                                        |  Bin 0 -> 3016 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 2969 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 2970 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 2974 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/cas.bin        |  Bin 0 -> 2948 bytes
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/cas.bin      |  Bin 0 -> 2952 bytes
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/cas.bin         |  Bin 0 -> 3105 bytes
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../cas.bin                                        |  Bin 0 -> 3838 bytes
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/cas.bin      |  Bin 0 -> 3000 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../cas.bin                                        |  Bin 0 -> 2987 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3003 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3038 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2986 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2981 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/cas.bin  |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2995 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 2903 bytes
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/cas.bin      |  Bin 0 -> 3139 bytes
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/cas.bin        |  Bin 0 -> 3153 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/cas.bin        |  Bin 0 -> 3153 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../cas.bin                                        |  Bin 0 -> 2938 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 2986 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 2973 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 2959 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 2964 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3016 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3015 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3016 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/cas.bin  |  Bin 0 -> 2475 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/cas.bin      |  Bin 0 -> 2686 bytes
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../typesystem.xml                                 |   74 +
 .../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 +
 .../casWithLeftToRightTextAndAnnotations/cas.bin   |  Bin 0 -> 2424 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/cas.bin           |  Bin 0 -> 2394 bytes
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/cas.bin             |  Bin 0 -> 2432 bytes
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/cas.bin                    |  Bin 0 -> 2406 bytes
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotations/cas.bin      |  Bin 0 -> 2423 bytes
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../cas.bin                                        |  Bin 0 -> 2430 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/cas.bin       |  Bin 0 -> 2387 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/cas.bin                       |  Bin 0 -> 2348 bytes
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/cas.bin           |  Bin 0 -> 3954 bytes
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../one-way/cas_with_empty_array_reference/cas.bin |  Bin 0 -> 2973 bytes
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/cas.bin           |  Bin 0 -> 3158 bytes
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/cas.bin         |  Bin 0 -> 3114 bytes
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/cas.bin            |  Bin 0 -> 3630 bytes
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/cas.bin        |  Bin 0 -> 2916 bytes
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/cas.bin               |  Bin 0 -> 3556 bytes
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/cas.bin             |  Bin 0 -> 2959 bytes
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/cas.bin                      |  Bin 0 -> 2854 bytes
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/cas.bin                      |  Bin 0 -> 3319 bytes
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../cas.bin                                        |  Bin 0 -> 3494 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3494 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3494 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3494 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3829 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3741 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../cas.bin                                        |  Bin 0 -> 3732 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/cas.bin  |  Bin 0 -> 3906 bytes
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/cas.bin          |  Bin 0 -> 3564 bytes
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/cas.bin       |  Bin 0 -> 3724 bytes
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../one-way/tsv3-testMultiTokenSlotFeature/cas.bin |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../cas.bin                                        |  Bin 0 -> 3555 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3546 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/cas.bin  |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3590 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3570 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/cas.bin            |  Bin 0 -> 3676 bytes
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/cas.bin     |  Bin 0 -> 3548 bytes
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../one-way/tsv3-testSentenceWithLineBreak/cas.bin |  Bin 0 -> 3546 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/cas.bin       |  Bin 0 -> 3546 bytes
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/cas.bin           |  Bin 0 -> 3756 bytes
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../tsv3-testSimpleCrossSenenceSlotFeature/cas.bin |  Bin 0 -> 3986 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/cas.bin     |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/cas.bin     |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../cas.bin                                        |  Bin 0 -> 3790 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3777 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3703 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3685 bytes
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3703 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.bin                                        |  Bin 0 -> 3751 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3751 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3727 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3727 bytes
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3613 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3679 bytes
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3605 bytes
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3546 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/cas.bin          |  Bin 0 -> 3868 bytes
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../cas.bin                                        |  Bin 0 -> 3831 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3905 bytes
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 3823 bytes
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3862 bytes
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../cas.bin                                        |  Bin 0 -> 4156 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../cas.bin                                        |  Bin 0 -> 3793 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 3546 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3546 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.bin                                        |  Bin 0 -> 3570 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/cas.bin        |  Bin 0 -> 3396 bytes
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/cas.bin      |  Bin 0 -> 3426 bytes
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/cas.bin         |  Bin 0 -> 3756 bytes
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../cas.bin                                        |  Bin 0 -> 4634 bytes
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/cas.bin      |  Bin 0 -> 3702 bytes
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../cas.bin                                        |  Bin 0 -> 3662 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3677 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3957 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3797 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3662 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3642 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/cas.bin  |  Bin 0 -> 3722 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3812 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.bin                                        |  Bin 0 -> 3378 bytes
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/cas.bin      |  Bin 0 -> 3748 bytes
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/cas.bin        |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/cas.bin        |  Bin 0 -> 3800 bytes
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../cas.bin                                        |  Bin 0 -> 3409 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3585 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3570 bytes
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3548 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../cas.bin                                        |  Bin 0 -> 3588 bytes
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../cas.bin                                        |  Bin 0 -> 3495 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3494 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.bin                                        |  Bin 0 -> 3495 bytes
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/cas.bin  |  Bin 0 -> 3009 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/cas.bin      |  Bin 0 -> 3129 bytes
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../ser-ref/casWithFsList/cas.bin                  |  Bin 0 -> 3603 bytes
 .../ser-ref/casWithFsList/debug-typesystem.xml     |  117 +
 .../ser-ref/casWithFsList/debug.xmi                |   38 +
 .../casWithLeftToRightTextAndAnnotations/cas.bin   |  Bin 0 -> 2812 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/cas.bin           |  Bin 0 -> 2742 bytes
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/cas.bin             |  Bin 0 -> 2778 bytes
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/cas.bin                    |  Bin 0 -> 2768 bytes
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotations/cas.bin      |  Bin 0 -> 2847 bytes
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../cas.bin                                        |  Bin 0 -> 2851 bytes
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/cas.bin       |  Bin 0 -> 2783 bytes
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/cas.bin                       |  Bin 0 -> 2656 bytes
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/cas.xcas          |  131 +
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../cas_with_empty_array_reference/cas.xcas        |   10 +
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/cas.xcas          |    9 +
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/cas.xcas        |   13 +
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/cas.xcas           |   21 +
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/cas.xcas       |    5 +
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/cas.xcas              |   24 +
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/cas.xcas            |    6 +
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/cas.xcas                     |    5 +
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/cas.xcas                     |   17 +
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |   19 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   16 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../cas.xcas                                       |   16 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/cas.xcas |   13 +
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/cas.xcas         |    7 +
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/cas.xcas      |   13 +
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../tsv3-testMultiTokenSlotFeature/cas.xcas        |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/cas.xcas |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/cas.xcas           |   15 +
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/cas.xcas    |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../tsv3-testSentenceWithLineBreak/cas.xcas        |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/cas.xcas      |   11 +
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/cas.xcas          |   14 +
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../cas.xcas                                       |   24 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/cas.xcas    |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/cas.xcas    |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../cas.xcas                                       |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   13 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../cas.xcas                                       |   13 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.xcas                                       |   13 +
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../cas.xcas                                       |   13 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   14 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.xcas                                       |   14 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/cas.xcas         |   18 +
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../cas.xcas                                       |   26 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../cas.xcas                                       |   14 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../cas.xcas                                       |   26 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../cas.xcas                                       |   32 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../cas.xcas                                       |   20 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   11 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/cas.xcas       |    7 +
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/cas.xcas     |    8 +
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/cas.xcas        |   14 +
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../cas.xcas                                       |   14 +
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/cas.xcas     |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/cas.xcas |   15 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../cas.xcas                                       |   20 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/cas.xcas     |   13 +
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/cas.xcas       |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/cas.xcas       |   19 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../cas.xcas                                       |   12 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../cas.xcas                                       |   14 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/cas.xcas |   13 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/cas.xcas     |   17 +
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../typesystem.xml                                 |   74 +
 .../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 +
 .../casWithLeftToRightTextAndAnnotations/cas.xcas  |    6 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/cas.xcas          |   19 +
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/cas.xcas            |    3 +
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/cas.xcas                   |    4 +
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotations/cas.xcas     |    8 +
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../cas.xcas                                       |    8 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/cas.xcas      |    7 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/cas.xcas                      |    1 +
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/data.xmi          |   42 +
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../cas_with_empty_array_reference/data.xmi        |   12 +
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/data.xmi          |   11 +
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/data.xmi        |   10 +
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/data.xmi           |   19 +
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/data.xmi       |    7 +
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/data.xmi              |   26 +
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/data.xmi            |    9 +
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/data.xmi                     |    7 +
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/data.xmi                     |   19 +
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   18 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../data.xmi                                       |   18 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/data.xmi |   15 +
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/data.xmi         |    9 +
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/data.xmi      |   15 +
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../tsv3-testMultiTokenSlotFeature/data.xmi        |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/data.xmi |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/data.xmi           |   17 +
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/data.xmi    |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../tsv3-testSentenceWithLineBreak/data.xmi        |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/data.xmi      |   13 +
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/data.xmi          |   16 +
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/data.xmi    |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/data.xmi    |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/data.xmi         |   20 +
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   20 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   20 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../data.xmi                                       |   34 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/data.xmi       |    9 +
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/data.xmi     |   10 +
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/data.xmi        |   16 +
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/data.xmi     |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/data.xmi |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/data.xmi     |   15 +
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/data.xmi       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/data.xmi       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/data.xmi |   15 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/data.xmi     |    7 +
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../typesystem.xml                                 |   74 +
 .../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 +
 .../casWithLeftToRightTextAndAnnotations/data.xmi  |    8 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/data.xmi          |    5 +
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/data.xmi            |    4 +
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/data.xmi                   |    6 +
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotations/data.xmi     |   10 +
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/data.xmi      |    9 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/data.xmi                      |    3 +
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../one-way/cas_with_collections/data.xmi          |   42 +
 .../cas_with_collections/debug-typesystem.xml      |   69 +
 .../one-way/cas_with_collections/debug.xmi         |   42 +
 .../cas_with_empty_array_reference/data.xmi        |   12 +
 .../debug-typesystem.xml                           |   34 +
 .../cas_with_empty_array_reference/debug.xmi       |   12 +
 .../one-way/cas_with_inheritance/data.xmi          |   11 +
 .../cas_with_inheritance/debug-typesystem.xml      |   56 +
 .../one-way/cas_with_inheritance/debug.xmi         |   11 +
 .../one-way/cas_with_nonindexed_fs/data.xmi        |   10 +
 .../cas_with_nonindexed_fs/debug-typesystem.xml    |   42 +
 .../one-way/cas_with_nonindexed_fs/debug.xmi       |   10 +
 .../one-way/cas_with_references/data.xmi           |   19 +
 .../cas_with_references/debug-typesystem.xml       |   74 +
 .../one-way/cas_with_references/debug.xmi          |   19 +
 .../one-way/cas_with_reserved_names/data.xmi       |    7 +
 .../cas_with_reserved_names/debug-typesystem.xml   |   39 +
 .../one-way/cas_with_reserved_names/debug.xmi      |    7 +
 .../one-way/cas_with_smileys/data.xmi              |   26 +
 .../one-way/cas_with_smileys/debug-typesystem.xml  |   46 +
 .../one-way/cas_with_smileys/debug.xmi             |   26 +
 .../one-way/cas_with_two_sofas/data.xmi            |    9 +
 .../cas_with_two_sofas/debug-typesystem.xml        |   17 +
 .../one-way/cas_with_two_sofas/debug.xmi           |    9 +
 .../one-way/empty_cas/data.xmi                     |    7 +
 .../one-way/empty_cas/debug-typesystem.xml         |   17 +
 .../one-way/empty_cas/debug.xmi                    |    7 +
 .../one-way/small_cas/data.xmi                     |   19 +
 .../one-way/small_cas/debug-typesystem.xml         |   47 +
 .../one-way/small_cas/debug.xmi                    |   19 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   18 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../data.xmi                                       |   18 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   18 +
 .../one-way/tsv3-testDependencyWithValues/data.xmi |   15 +
 .../debug-typesystem.xml                           |  142 +
 .../tsv3-testDependencyWithValues/debug.xmi        |   15 +
 .../one-way/tsv3-testElevatedType/data.xmi         |    9 +
 .../tsv3-testElevatedType/debug-typesystem.xml     |  120 +
 .../one-way/tsv3-testElevatedType/debug.xmi        |    9 +
 .../one-way/tsv3-testMultiTokenChain/data.xmi      |   15 +
 .../tsv3-testMultiTokenChain/debug-typesystem.xml  |  127 +
 .../one-way/tsv3-testMultiTokenChain/debug.xmi     |   15 +
 .../tsv3-testMultiTokenSlotFeature/data.xmi        |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testMultiTokenSlotFeature/debug.xmi       |   17 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../tsv3-testMultiTokenStackedSlotFeature/data.xmi |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSentenceId/data.xmi           |   17 +
 .../tsv3-testSentenceId/debug-typesystem.xml       |   93 +
 .../one-way/tsv3-testSentenceId/debug.xmi          |   17 +
 .../one-way/tsv3-testSentenceWithEmoji/data.xmi    |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../one-way/tsv3-testSentenceWithEmoji/debug.xmi   |   13 +
 .../tsv3-testSentenceWithLineBreak/data.xmi        |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testSentenceWithLineBreak/debug.xmi       |   13 +
 .../one-way/tsv3-testSentenceWithTab/data.xmi      |   13 +
 .../tsv3-testSentenceWithTab/debug-typesystem.xml  |  105 +
 .../one-way/tsv3-testSentenceWithTab/debug.xmi     |   13 +
 .../one-way/tsv3-testSimpleChain/data.xmi          |   16 +
 .../tsv3-testSimpleChain/debug-typesystem.xml      |  127 +
 .../one-way/tsv3-testSimpleChain/debug.xmi         |   16 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   22 +
 .../tsv3-testSimpleSameRoleSlotFeature/data.xmi    |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/debug.xmi   |   17 +
 .../one-way/tsv3-testSimpleSlotFeature/data.xmi    |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../one-way/tsv3-testSimpleSlotFeature/debug.xmi   |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  122 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   15 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   15 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  127 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  125 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  115 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../one-way/tsv3-testStackedChain/data.xmi         |   20 +
 .../tsv3-testStackedChain/debug-typesystem.xml     |  127 +
 .../one-way/tsv3-testStackedChain/debug.xmi        |   20 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   20 +
 .../debug-typesystem.xml                           |  133 +
 .../debug.xmi                                      |   20 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  137 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   20 +
 .../debug-typesystem.xml                           |  128 +
 .../debug.xmi                                      |   20 +
 .../data.xmi                                       |   34 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   34 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   13 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   13 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../one-way/tsv3-testSubTokenPrefix/data.xmi       |    9 +
 .../tsv3-testSubTokenPrefix/debug-typesystem.xml   |  105 +
 .../one-way/tsv3-testSubTokenPrefix/debug.xmi      |    9 +
 .../one-way/tsv3-testSubTokenRelation/data.xmi     |   10 +
 .../tsv3-testSubTokenRelation/debug-typesystem.xml |  105 +
 .../one-way/tsv3-testSubTokenRelation/debug.xmi    |   10 +
 .../one-way/tsv3-testSubtokenChain/data.xmi        |   16 +
 .../tsv3-testSubtokenChain/debug-typesystem.xml    |  127 +
 .../one-way/tsv3-testSubtokenChain/debug.xmi       |   16 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |  256 +
 .../debug.xmi                                      |   16 +
 .../tsv3-testTokenBoundedBioLookAlike/data.xmi     |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../tsv3-testTokenBoundedBioLookAlike/debug.xmi    |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../tsv3-testTokenBoundedStackedLookAlike/data.xmi |   17 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   17 +
 .../data.xmi                                       |   22 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   22 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   93 +
 .../debug.xmi                                      |   10 +
 .../one-way/tsv3-testUnsetSlotFeature/data.xmi     |   15 +
 .../tsv3-testUnsetSlotFeature/debug-typesystem.xml |  128 +
 .../one-way/tsv3-testUnsetSlotFeature/debug.xmi    |   15 +
 .../tsv3-testZeroLengthSlotFeature1/data.xmi       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature1/debug.xmi      |   17 +
 .../tsv3-testZeroLengthSlotFeature2/data.xmi       |   17 +
 .../debug-typesystem.xml                           |  128 +
 .../tsv3-testZeroLengthSlotFeature2/debug.xmi      |   17 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |  105 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   14 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   14 +
 .../data.xmi                                       |   16 +
 .../debug-typesystem.xml                           |   98 +
 .../debug.xmi                                      |   16 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |  110 +
 .../debug.xmi                                      |   10 +
 .../casWithEmojiUnicodeTextAndAnnotations/data.xmi |   15 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   15 +
 .../casWithFloatingPointSpecialValues/data.xmi     |    7 +
 .../debug-typesystem.xml                           |   74 +
 .../casWithFloatingPointSpecialValues/debug.xmi    |    7 +
 .../typesystem.xml                                 |   74 +
 .../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 +
 .../casWithLeftToRightTextAndAnnotations/data.xmi  |    8 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithLeftToRightTextAndAnnotations/debug.xmi |    8 +
 .../ser-ref/casWithSofaDataArray/data.xmi          |    5 +
 .../casWithSofaDataArray/debug-typesystem.xml      |   17 +
 .../ser-ref/casWithSofaDataArray/debug.xmi         |    5 +
 .../ser-ref/casWithSofaDataURI/data.xmi            |    4 +
 .../casWithSofaDataURI/debug-typesystem.xml        |   17 +
 .../ser-ref/casWithSofaDataURI/debug.xmi           |    4 +
 .../ser-ref/casWithText/data.xmi                   |    6 +
 .../ser-ref/casWithText/debug-typesystem.xml       |   17 +
 .../ser-ref/casWithText/debug.xmi                  |    6 +
 .../ser-ref/casWithTextAndAnnotation/data.xmi      |    7 +
 .../casWithTextAndAnnotation/debug-typesystem.xml  |   17 +
 .../ser-ref/casWithTextAndAnnotation/debug.xmi     |    7 +
 .../ser-ref/casWithTextAndAnnotations/data.xmi     |   10 +
 .../casWithTextAndAnnotations/debug-typesystem.xml |   17 +
 .../ser-ref/casWithTextAndAnnotations/debug.xmi    |   10 +
 .../data.xmi                                       |   10 +
 .../debug-typesystem.xml                           |   17 +
 .../debug.xmi                                      |   10 +
 .../casWithoutTextButWithAnnotations/data.xmi      |    9 +
 .../debug-typesystem.xml                           |   17 +
 .../casWithoutTextButWithAnnotations/debug.xmi     |    9 +
 .../ser-ref/emptyCas/data.xmi                      |    3 +
 .../ser-ref/emptyCas/debug-typesystem.xml          |   17 +
 .../ser-ref/emptyCas/debug.xmi                     |    3 +
 .../document.txt                                   |    1 +
 .../src/test/resources/XmiFileDataSuite/README.md  |   30 +
 .../XmiFileDataSuite/cas_with_collections/data.xmi |   58 +
 .../cas_with_collections/typesystem.xml            |   57 +
 .../cas_with_empty_array_reference/data.xmi        |   26 +
 .../cas_with_empty_array_reference/typesystem.xml  |   22 +
 .../XmiFileDataSuite/cas_with_inheritance/data.xmi |   14 +
 .../cas_with_inheritance/typesystem.xml            |   44 +
 .../cas_with_nonindexed_fs/data.xmi                |   10 +
 .../cas_with_nonindexed_fs/typesystem.xml          |   30 +
 .../XmiFileDataSuite/cas_with_references/data.xmi  |   19 +
 .../cas_with_references/typesystem.xml             |   62 +
 .../cas_with_reserved_names/data.xmi               |    7 +
 .../cas_with_reserved_names/typesystem.xml         |   27 +
 .../XmiFileDataSuite/cas_with_smileys/data.xmi     |   26 +
 .../cas_with_smileys/typesystem.xml                |   34 +
 .../XmiFileDataSuite/cas_with_two_sofas/data.xmi   |   18 +
 .../cas_with_two_sofas/typesystem.xml              |    2 +
 .../resources/XmiFileDataSuite/empty_cas/data.xmi  |    7 +
 .../XmiFileDataSuite/empty_cas/typesystem.xml      |    2 +
 .../resources/XmiFileDataSuite/small_cas/data.xmi  |   19 +
 .../XmiFileDataSuite/small_cas/typesystem.xml      |   36 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  133 +
 .../data.xmi                                       |   18 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   18 +
 .../typesystem.xml                                 |  105 +
 .../tsv3-testDependencyWithValues/data.xmi         |   15 +
 .../tsv3-testDependencyWithValues/typesystem.xml   |  142 +
 .../tsv3-testElevatedType/data.xmi                 |    9 +
 .../tsv3-testElevatedType/typesystem.xml           |  120 +
 .../tsv3-testMultiTokenChain/data.xmi              |   15 +
 .../tsv3-testMultiTokenChain/typesystem.xml        |  127 +
 .../tsv3-testMultiTokenSlotFeature/data.xmi        |   17 +
 .../tsv3-testMultiTokenSlotFeature/typesystem.xml  |  128 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  105 +
 .../tsv3-testMultiTokenStackedSlotFeature/data.xmi |   17 +
 .../typesystem.xml                                 |  128 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |  105 +
 .../XmiFileDataSuite/tsv3-testSentenceId/data.xmi  |   17 +
 .../tsv3-testSentenceId/typesystem.xml             |   93 +
 .../tsv3-testSentenceWithEmoji/data.xmi            |   13 +
 .../tsv3-testSentenceWithEmoji/typesystem.xml      |  105 +
 .../tsv3-testSentenceWithLineBreak/data.xmi        |   13 +
 .../tsv3-testSentenceWithLineBreak/typesystem.xml  |  105 +
 .../tsv3-testSentenceWithTab/data.xmi              |   13 +
 .../tsv3-testSentenceWithTab/typesystem.xml        |  105 +
 .../XmiFileDataSuite/tsv3-testSimpleChain/data.xmi |   16 +
 .../tsv3-testSimpleChain/typesystem.xml            |  127 +
 .../data.xmi                                       |   22 +
 .../typesystem.xml                                 |  128 +
 .../tsv3-testSimpleSameRoleSlotFeature/data.xmi    |   17 +
 .../typesystem.xml                                 |  128 +
 .../tsv3-testSimpleSlotFeature/data.xmi            |   17 +
 .../tsv3-testSimpleSlotFeature/typesystem.xml      |  128 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  128 +
 .../data.xmi                                       |   15 +
 .../typesystem.xml                                 |  137 +
 .../data.xmi                                       |   15 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   15 +
 .../typesystem.xml                                 |  122 +
 .../data.xmi                                       |   15 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |  127 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  115 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  125 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  115 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  105 +
 .../tsv3-testStackedChain/data.xmi                 |   20 +
 .../tsv3-testStackedChain/typesystem.xml           |  127 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |  133 +
 .../data.xmi                                       |   20 +
 .../typesystem.xml                                 |  133 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |  137 +
 .../data.xmi                                       |   20 +
 .../typesystem.xml                                 |  128 +
 .../data.xmi                                       |   34 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   22 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   13 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |  105 +
 .../tsv3-testSubTokenPrefix/data.xmi               |    9 +
 .../tsv3-testSubTokenPrefix/typesystem.xml         |  105 +
 .../tsv3-testSubTokenRelation/data.xmi             |   10 +
 .../tsv3-testSubTokenRelation/typesystem.xml       |  105 +
 .../tsv3-testSubtokenChain/data.xmi                |   16 +
 .../tsv3-testSubtokenChain/typesystem.xml          |  127 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |  256 +
 .../tsv3-testTokenBoundedBioLookAlike/data.xmi     |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   17 +
 .../typesystem.xml                                 |  105 +
 .../tsv3-testTokenBoundedStackedLookAlike/data.xmi |   17 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   22 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |   93 +
 .../tsv3-testUnsetSlotFeature/data.xmi             |   15 +
 .../tsv3-testUnsetSlotFeature/typesystem.xml       |  128 +
 .../tsv3-testZeroLengthSlotFeature1/data.xmi       |   17 +
 .../tsv3-testZeroLengthSlotFeature1/typesystem.xml |  128 +
 .../tsv3-testZeroLengthSlotFeature2/data.xmi       |   17 +
 .../tsv3-testZeroLengthSlotFeature2/typesystem.xml |  128 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |   98 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |  105 +
 .../data.xmi                                       |   14 +
 .../typesystem.xml                                 |   98 +
 .../data.xmi                                       |   16 +
 .../typesystem.xml                                 |   98 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 .../data.xmi                                       |   10 +
 .../typesystem.xml                                 |  110 +
 uimaj-cpe/.gitignore                               |    4 +-
 uimaj-cpe/pom.xml                                  |    2 +-
 .../cas_data/impl/vinci/VinciCasDataConverter.java |    3 +-
 .../apache/uima/collection/impl/CasConverter.java  |    5 +-
 .../impl/CollectionProcessingEngine_impl.java      |   14 +
 .../collection/impl/EntityProcessStatusImpl.java   |    6 +
 .../container/CasProcessorConfiguration.java       |   42 +-
 .../base_cpm/container/CasProcessorController.java |   24 +-
 .../impl/base_cpm/container/RunnableContainer.java |    4 +-
 .../base_cpm/container/deployer/CPEDeployer.java   |    2 +-
 .../container/deployer/CasProcessorDeployer.java   |    8 +-
 .../deployer/CasProcessorDeploymentException.java  |    1 -
 .../apache/uima/collection/impl/cpm/CPMImpl.java   |    9 +
 .../impl/cpm/StatusCallbackListenerImpl.java       |    7 +
 .../CasProcessorConfigurationJAXBImpl.java         |   21 +
 .../cpm/container/NetworkCasProcessorImpl.java     |    7 +
 .../container/deployer/CPEDeployerDefaultImpl.java |    4 +
 .../container/deployer/FencedProcessReaper.java    |    1 -
 .../cpm/container/deployer/NonJavaApplication.java |    2 +-
 .../deployer/socket/OFSocketTransportImpl.java     |    1 -
 .../deployer/socket/ProcessControllerAdapter.java  |    4 +-
 .../container/deployer/socket/SocketTransport.java |    8 +-
 .../container/deployer/vns/VinciServiceInfo.java   |    1 +
 .../impl/cpm/engine/CPMChunkTimeoutException.java  |    1 -
 .../collection/impl/cpm/engine/CPMThreadGroup.java |    1 -
 .../collection/impl/cpm/engine/ProcessingUnit.java |    1 -
 .../uima/collection/impl/cpm/engine/WorkUnit.java  |    1 -
 .../uima/collection/impl/cpm/utils/Execute.java    |    1 -
 .../collection/impl/cpm/utils/ExpirationTimer.java |    1 -
 .../uima/collection/impl/cpm/utils/Timer.java      |   14 +-
 .../impl/metadata/cpe/CpeCasProcessorsImpl.java    |    1 -
 .../impl/metadata/cpe/CpeDescriptionImpl.java      |    1 -
 .../cpe/CpeIntegratedCasProcessorImpl.java         |    1 -
 .../metadata/cpe/CpeLocalCasProcessorImpl.java     |    3 -
 .../metadata/cpe/CpeRemoteCasProcessorImpl.java    |    1 -
 .../impl/SofaNamingInAggregateTest.java            |   42 +-
 .../uima/analysis_engine/impl/TestAnnotator.java   |    3 +
 .../impl/CasHeapSizeTestCollectionReader.java      |    6 +-
 .../impl/CollectionProcessingEngine_implTest.java  |   37 +-
 .../collection/impl/SingleDocCollectionReader.java |    4 +
 .../uima/collection/impl/TestCasInitializer.java   |    1 +
 .../uima/collection/impl/TestCasMultiplier.java    |    6 +-
 .../uima/collection/impl/cpm/CasPoolTest.java      |   21 +-
 .../impl/cpm/CpeCasProcessorAPI_Test.java          |   18 +-
 .../impl/cpm/CpeDescriptorSerialization_Test.java  |   28 +-
 .../uima/collection/impl/cpm/CpeImportTest.java    |   32 +-
 .../uima/collection/impl/cpm/CpmAE_ErrorTest.java  |   60 +-
 .../impl/cpm/CpmCasConsumer_ErrorTest.java         |   37 +-
 .../impl/cpm/CpmCollectionReader_ErrorTest.java    |   56 +-
 .../uima/collection/impl/cpm/CpmInitTest.java      |   22 +-
 .../collection/impl/cpm/CpmProcessingTest.java     |   32 +-
 .../uima/collection/impl/cpm/CpmStopTest.java      |   25 +-
 .../uima/collection/impl/cpm/PearCasPoolTest.java  |   29 +-
 .../impl/cpm/SofaCPE_SofaUnawareCC_Test.java       |   78 +-
 .../uima/collection/impl/cpm/SofaCPE_Test.java     |   78 +-
 .../collection/impl/cpm/SofaMixedCPE_Test.java     |   75 +-
 .../impl/cpm/utils/ErrorTestAnnotator.java         |    4 +-
 .../impl/cpm/utils/ErrorTestCasConsumer.java       |    3 +-
 .../impl/cpm/utils/ErrorTestCollectionReader.java  |    5 +
 .../collection/impl/cpm/utils/SlowAnnotator.java   |    1 +
 .../impl/cpm/utils/TestStatusCallbackListener.java |    7 +
 .../uima/examples/cpm/sofa/SofaCasConsumer.java    |    4 +-
 .../uima/examples/cpm/sofa/SofaCasInitializer.java |    1 +
 .../examples/cpm/sofa/SofaCollectionReader.java    |    5 +-
 .../examples/cpm/sofa/SofaUnawareCasConsumer.java  |    4 +-
 .../examples/cpm/sofa/TcasCollectionReader.java    |    4 +
 .../uima/examples/cpm/sofa/TcasTransAnnotator.java |    1 +
 .../uima/examples/cpm/sofa/TransAnnotator.java     |    1 +
 .../uima/pear/util/ComponentCategoryTest.java      |   10 +-
 .../resource/impl/TestResourceInterface_impl.java  |    6 +-
 uimaj-document-annotation/.gitignore               |    2 +
 uimaj-document-annotation/pom.xml                  |    2 +-
 .../apache/uima/jcas/tcas/DocumentAnnotation.java  |    1 +
 .../java/org/apache/uima/jcas/tcas/DocMeta.java    |    6 +-
 .../uima/jcas/tcas/DocumentAnnotationTest.java     |   21 +-
 uimaj-eclipse-feature-runtime/.gitignore           |    4 +-
 uimaj-eclipse-feature-runtime/pom.xml              |    2 +-
 uimaj-eclipse-feature-tools/.gitignore             |    4 +-
 uimaj-eclipse-feature-tools/pom.xml                |    2 +-
 uimaj-eclipse-update-site/pom.xml                  |  484 +-
 uimaj-ep-cas-editor-ide/.gitignore                 |    2 +
 uimaj-ep-cas-editor-ide/pom.xml                    |    6 +-
 .../uima/caseditor/ide/CasEditorIdePlugin.java     |  358 +-
 .../ide/CasEditorIdePreferenceInitializer.java     |    3 +-
 .../caseditor/ide/CasEditorIdePreferencePage.java  |    1 +
 .../caseditor/ide/CasEditorPerspectiveFactory.java |  191 +-
 .../caseditor/ide/CasEditorPreferencePage.java     |   87 +-
 .../caseditor/ide/DefaultCasDocumentProvider.java  |    5 +
 .../org/apache/uima/caseditor/ide/NlpProject.java  |    4 +
 .../searchstrategy/ITypeSystemSearchStrategy.java  |   56 +-
 .../TypeSystemSearchStrategyFactory.java           |  162 +-
 .../ide/wizards/ContainerElementFilter.java        |   84 +-
 .../wizards/DocumentImportStructureProvider.java   |  423 +-
 .../ide/wizards/ImportDocumentWizard.java          |  279 +-
 .../ide/wizards/ImportDocumentWizardPage.java      |  993 +--
 .../uima/caseditor/ide/wizards/OverwriteQuery.java |    2 +
 uimaj-ep-cas-editor/.gitignore                     |    2 +
 uimaj-ep-cas-editor/pom.xml                        |   13 +-
 .../org/apache/uima/caseditor/CasEditorPlugin.java |  382 +-
 .../java/org/apache/uima/caseditor/Images.java     |  166 +-
 .../org/apache/uima/caseditor/core/TaeError.java   |   98 +-
 .../caseditor/core/model/dotcorpus/DotCorpus.java  |  618 +-
 .../core/model/dotcorpus/DotCorpusSerializer.java  |  652 +-
 .../editor/AbstractAnnotationDocumentListener.java |  228 +-
 .../uima/caseditor/editor/AbstractDocument.java    |  430 +-
 .../caseditor/editor/AbstractDocumentListener.java |  154 +-
 .../uima/caseditor/editor/AnnotationDocument.java  |  624 +-
 .../uima/caseditor/editor/AnnotationEditor.java    | 3976 +++++-----
 .../editor/AnnotationEditorActionContributor.java  |  166 +-
 .../caseditor/editor/AnnotationEditorView.java     |  210 +-
 .../editor/AnnotationInformationProvider.java      |  186 +-
 .../editor/AnnotationSelectionListener.java        |  102 +-
 .../uima/caseditor/editor/AnnotationStyle.java     |  776 +-
 .../apache/uima/caseditor/editor/ArrayValue.java   |  376 +-
 .../uima/caseditor/editor/CasDocumentProvider.java |  462 +-
 .../uima/caseditor/editor/CasEditorView.java       |  520 +-
 .../uima/caseditor/editor/ChangeModeAction.java    |  142 +-
 .../caseditor/editor/CustomInformationControl.java |  368 +-
 .../uima/caseditor/editor/DocumentUimaImpl.java    |  838 +-
 .../editor/FeatureStructureSelection.java          |  204 +-
 .../editor/FeatureStructureSelectionIterator.java  |  190 +-
 .../editor/FeatureStructureSelectionProvider.java  |  280 +-
 .../apache/uima/caseditor/editor/FeatureValue.java |  256 +-
 .../editor/IAnnotationEditorModifyListener.java    |  102 +-
 .../apache/uima/caseditor/editor/ICasDocument.java |  290 +-
 .../caseditor/editor/ICasDocumentListener.java     |  188 +-
 .../caseditor/editor/ICasEditorInputListener.java  |   98 +-
 .../ICustomInformationControlContentHandler.java   |   68 +-
 .../caseditor/editor/IEditorSelectionListener.java |   78 +-
 .../caseditor/editor/ModelFeatureStructure.java    |  334 +-
 .../caseditor/editor/QuickTypeSelectionDialog.java |  796 +-
 .../action/DeleteFeatureStructureAction.java       |  138 +-
 .../action/LowerLeftAnnotationSideAction.java      |  184 +-
 .../action/LowerRightAnnotationSideAction.java     |  186 +-
 .../editor/action/MergeAnnotationAction.java       |  160 +-
 .../action/WideLeftAnnotationSideAction.java       |  186 +-
 .../action/WideRightAnnotationSideAction.java      |  184 +-
 .../annotation/BackgroundDrawingStrategy.java      |  288 +-
 .../editor/annotation/BoxDrawingStrategy.java      |  152 +-
 .../editor/annotation/BracketDrawingStrategy.java  |  176 +-
 .../caseditor/editor/annotation/DrawingStyle.java  |  150 +-
 .../editor/annotation/EclipseAnnotationPeer.java   |  158 +-
 .../annotation/TextColorDrawingStrategy.java       |  110 +-
 .../editor/annotation/TokenDrawingStrategy.java    |  182 +-
 .../annotation/UnderlineDrawingStrategy.java       |  136 +-
 .../editor/context/AnnotationEditingControl.java   |  108 +-
 .../context/AnnotationEditingControlCreator.java   |  134 +-
 .../editview/CreateFeatureStructureDialog.java     |  512 +-
 .../uima/caseditor/editor/editview/EditView.java   |  112 +-
 .../caseditor/editor/editview/EditViewPage.java    | 1710 ++--
 .../editview/FeatureColumnLabelProvider.java       |  108 +-
 .../editview/FeatureStructureContentProvider.java  |  562 +-
 .../editor/editview/ValueColumnLabelProvider.java  |  164 +-
 .../validator/ByteCellEditorValidator.java         |  100 +-
 .../validator/CellEditorValidatorFacotory.java     |  130 +-
 .../validator/FloatCellEditorValidator.java        |  102 +-
 .../validator/IntegerCellEditorValidator.java      |  102 +-
 .../validator/LongCellEditorValidator.java         |  100 +-
 .../validator/ShortCellEditorValidator.java        |  104 +-
 .../editor/fsview/FeatureStructureBrowserView.java |  114 +-
 .../fsview/FeatureStructureBrowserViewPage.java    | 1136 +--
 .../fsview/FeatureStructureLabelProvider.java      |  192 +-
 .../caseditor/editor/fsview/ITypePaneListener.java |   70 +-
 .../editor/outline/AnnotationOutline.java          |  892 +--
 .../editor/outline/AnnotationTreeNode.java         |  294 +-
 .../editor/outline/AnnotationTreeNodeList.java     |  268 +-
 .../editor/outline/OutlineLabelProvider.java       |  188 +-
 .../editor/outline/OutlineTableSorter.java         |  134 +-
 .../editor/util/AnnotationComparator.java          |   94 +-
 .../caseditor/editor/util/AnnotationSelection.java |  294 +-
 .../editor/util/ContainingConstraint.java          |  174 +-
 .../editor/util/FeatureStructureTransfer.java      |  114 +-
 .../uima/caseditor/editor/util/IDGenerator.java    |  182 +-
 .../uima/caseditor/editor/util/ObjectTransfer.java |  168 +-
 .../uima/caseditor/editor/util/Primitives.java     |  348 +-
 .../apache/uima/caseditor/editor/util/Span.java    |  318 +-
 .../editor/util/StrictTypeConstraint.java          |  116 +-
 .../uima/caseditor/editor/util/UimaUtil.java       |   98 +-
 .../ui/property/AnnotationPropertyPage.java        | 1292 +--
 .../core/model/dotcorpus/AnnotationStyleTest.java  |  130 +-
 .../model/dotcorpus/DotCorpusSerializerTest.java   |  124 +-
 .../apache/uima/caseditor/core/util/SpanTest.java  |  317 +-
 .../uima/caseditor/editor/AnnotationStyleTest.java |  117 +-
 .../uima/caseditor/editor/util/SpanTest.java       |  314 +-
 uimaj-ep-configurator/.gitignore                   |    2 +
 uimaj-ep-configurator/pom.xml                      |    2 +-
 .../uima/taeconfigurator/CDEpropertyPage.java      |    1 -
 .../uima/taeconfigurator/InternalErrorCDE.java     |    1 -
 .../uima/taeconfigurator/StandardStrings.java      |   26 +-
 .../taeconfigurator/TAEConfiguratorPlugin.java     |    1 -
 .../taeconfigurator/editors/MultiPageEditor.java   | 8377 ++++++++++----------
 .../editors/MultiPageEditorContributor.java        |   10 +-
 .../editors/point/IUimaEditorExtension.java        |    6 +-
 .../editors/point/IUimaMultiPageEditor.java        |    8 +-
 .../ui/dialogs/AbstractDialogKeyVerify.java        |    3 +-
 .../dialogs/AbstractDialogKeyVerifyJavaNames.java  |    3 +-
 .../ui/dialogs/AbstractDialogMultiColTable.java    |    6 +-
 .../editors/ui/dialogs/AddAllowedValueDialog.java  |    5 +-
 .../AddExternalResourceDependencyDialog.java       |    7 +-
 .../ui/dialogs/AddExternalResourceDialog.java      |   15 +-
 .../editors/ui/dialogs/AddIndexKeyDialog.java      |   11 +-
 .../editors/ui/dialogs/AddRemoteServiceDialog.java |    5 +-
 .../editors/ui/dialogs/AddSofaDialog.java          |    7 +-
 .../ui/dialogs/AddTypeToPriorityListDialog.java    |    5 +-
 .../editors/ui/dialogs/CommonInputDialog.java      |    3 +-
 .../editors/ui/dialogs/EditSofaBindingsDialog.java |    3 +-
 .../ui/dialogs/ExportImportablePartDialog.java     |    5 +-
 .../editors/ui/dialogs/FindComponentDialog.java    |    5 +-
 .../editors/ui/dialogs/PickTaeForTypesDialog.java  |   13 +-
 .../editors/ui/dialogs/SearchThread.java           |   13 +-
 .../editors/xml/NonRuleBasedDamagerRepairer.java   |    2 +-
 .../uima/taeconfigurator/editors/xml/TagRule.java  |    4 +-
 .../editors/xml/XMLConfiguration.java              |    3 +-
 .../editors/xml/XMLDoubleClickStrategy.java        |    5 +-
 .../taeconfigurator/editors/xml/XMLEditor.java     |    5 +-
 .../editors/xml/XMLPartitionScanner.java           |    6 +-
 .../taeconfigurator/editors/xml/XMLScanner.java    |    9 +-
 .../taeconfigurator/editors/xml/XMLTagScanner.java |    9 +-
 ...MultiResourceSelectionDialogWithFlowOption.java |    9 +-
 .../taeconfigurator/wizards/AbstractNewWizard.java |    6 +-
 .../wizards/AbstractNewWizardPage.java             |    3 +-
 uimaj-ep-debug/.gitignore                          |    2 +
 uimaj-ep-debug/pom.xml                             |    2 +-
 .../java/org/apache/uima/ep_debug/DebugPlugin.java |    3 -
 .../apache/uima/ep_debug/DebugPluginStartup.java   |  132 +-
 uimaj-ep-jcasgen/.gitignore                        |    2 +
 uimaj-ep-jcasgen/pom.xml                           |    2 +-
 .../org/apache/uima/jcas/jcasgenp/JgPlugin.java    |    1 -
 uimaj-ep-launcher/.gitignore                       |    2 +
 uimaj-ep-launcher/pom.xml                          |    2 +-
 .../apache/uima/ep_launcher/RemoteLauncher.java    |    2 +
 .../uima/ep_launcher/ui/AnalysisEngineMainTab.java |   28 +-
 .../ep_launcher/ui/AnalysisEngineTabGroup.java     |    1 +
 uimaj-ep-pear-packager/.gitignore                  |    2 +
 uimaj-ep-pear-packager/pom.xml                     |    2 +-
 .../java/org/apache/uima/pear/PearException.java   |  309 +-
 .../main/java/org/apache/uima/pear/PearPlugin.java |  181 +-
 .../uima/pear/actions/AddUimaNatureAction.java     |  280 +-
 .../actions/EditInstallationDescriptorAction.java  |  223 +-
 .../uima/pear/actions/GeneratePearFileAction.java  |  313 +-
 .../actions/PearProjectCustomizationException.java |  299 +-
 .../uima/pear/generate/GeneratePearWizard.java     |  510 +-
 .../org/apache/uima/pear/generate/PearExport.java  |  104 +-
 .../uima/pear/generate/PearExportMessages.java     |  146 +-
 .../uima/pear/generate/PearExportOperation.java    |  392 +-
 .../pear/generate/PearFileResourceExportPage.java  |  826 +-
 .../edit/EditInstallationDescriptorWizard.java     |  444 +-
 .../uima/pear/insd/edit/INSDComponentPage.java     |  817 +-
 .../uima/pear/insd/edit/INSDEnvironmentPage.java   | 1055 ++-
 .../apache/uima/pear/insd/edit/InsdConstants.java  |  128 +-
 .../pear/insd/edit/PearInstallationDescriptor.java |  277 +-
 .../edit/vars/AbstractVarValViewerHandler.java     |  721 +-
 .../pear/insd/edit/vars/IVarValListViewer.java     |   96 +-
 .../apache/uima/pear/insd/edit/vars/VarVal.java    |  203 +-
 .../pear/insd/edit/vars/VarValCellModifier.java    |  253 +-
 .../pear/insd/edit/vars/VarValLabelProvider.java   |  144 +-
 .../uima/pear/insd/edit/vars/VarValList.java       |  325 +-
 .../uima/pear/insd/edit/vars/VarValSorter.java     |  177 +-
 .../pear/insd/edit/vars/VarValViewerHandler.java   |  219 +-
 .../apache/uima/pear/nature/ProjectCustomizer.java |  477 +-
 .../org/apache/uima/pear/nature/UimaNature.java    |  159 +-
 uimaj-ep-runtime/.gitignore                        |    2 +
 uimaj-ep-runtime/pom.xml                           |    2 +-
 uimaj-examples/.gitignore                          |    2 +
 uimaj-examples/pom.xml                             |    2 +-
 .../src/main/java/example/PersonTitle.java         |    7 +-
 .../apache/uima/examples/ExampleApplication.java   |    1 -
 .../main/java/org/apache/uima/examples/RunAE.java  |    7 +
 .../apache/uima/examples/SofaExampleAnnotator.java |    1 +
 .../uima/examples/SofaExampleApplication.java      |    3 -
 .../uima/examples/SourceDocumentInformation.java   |    4 +-
 .../java/org/apache/uima/examples/XmlDetagger.java |    7 +
 .../uima/examples/cas/PersonTitleAnnotator.java    |    3 +
 .../apache/uima/examples/cas/RegExAnnotator.java   |    3 +
 .../examples/casMultiplier/SimpleTextMerger.java   |  330 +-
 .../casMultiplier/SimpleTextSegmenter.java         |    4 +
 .../uima/examples/cpe/AnnotationPrinter.java       |    6 +
 .../examples/cpe/FileSystemCollectionReader.java   |  436 +-
 .../uima/examples/cpe/InlineXmlCasConsumer.java    |    2 +
 .../cpe/PersonTitleDBWriterCasConsumer.java        |    3 +
 .../org/apache/uima/examples/cpe/SimpleRunCPM.java |    7 +
 .../uima/examples/cpe/XCasWriterCasConsumer.java   |    2 +
 .../examples/flow/AdvancedFixedFlowController.java |  608 +-
 .../examples/flow/WhiteboardFlowController.java    |    3 +
 .../examples/flow/WhiteboardFlowController2.java   |    4 +
 .../apache/uima/examples/tokenizer/Sentence.java   |    9 +-
 .../tokenizer/SimpleTokenAndSentenceAnnotator.java |    3 +
 .../org/apache/uima/examples/tokenizer/Token.java  |    9 +-
 .../uima/examples/xmi/XmiCollectionReader.java     |  243 +-
 .../uima/examples/xmi/XmiEcoreCasConsumer.java     |    1 +
 .../uima/examples/xmi/XmiWriterCasConsumer.java    |    2 +
 .../java/org/apache/uima/tutorial/DateAnnot.java   |    9 +-
 .../org/apache/uima/tutorial/DateTimeAnnot.java    |    7 +-
 .../java/org/apache/uima/tutorial/Meeting.java     |    8 +-
 .../java/org/apache/uima/tutorial/RoomNumber.java  |    7 +-
 .../org/apache/uima/tutorial/SentenceAnnot.java    |    6 +-
 .../java/org/apache/uima/tutorial/TimeAnnot.java   |    9 +-
 .../java/org/apache/uima/tutorial/UimaAcronym.java |    7 +-
 .../java/org/apache/uima/tutorial/UimaMeeting.java |    9 +-
 .../java/org/apache/uima/tutorial/WordAnnot.java   |    6 +-
 .../uima/tutorial/ex1/RoomNumberAnnotator.java     |    1 +
 .../uima/tutorial/ex2/RoomNumberAnnotator.java     |    2 +
 .../apache/uima/tutorial/ex3/TutorialDateTime.java |    3 +
 .../apache/uima/tutorial/ex4/MeetingAnnotator.java |    2 +
 .../uima/tutorial/ex5/RoomNumberAnnotator.java     |    2 +
 .../uima/tutorial/ex6/StringMapResource.java       |    2 +-
 .../uima/tutorial/ex6/StringMapResource_impl.java  |    2 +
 .../uima/tutorial/ex6/UimaAcronymAnnotator.java    |    2 +
 .../src/org/apache/uima/util/jet/JetExpander.java  |  548 +-
 uimaj-json/.gitignore                              |    2 +
 uimaj-json/pom.xml                                 |    2 +-
 .../org/apache/uima/json/JsonCasSerializer.java    | 2992 +++----
 .../apache/uima/json/JsonMetaDataSerializer.java   |  347 +-
 .../impl/JsonContentHandlerJacksonWrapper.java     |  820 +-
 .../json/impl/MetaDataObjectSerializer_json.java   |  441 +-
 .../apache/uima/json/JsonCasSerializerTest.java    | 1224 +--
 .../apache/uima/json/JsonMetaDataObjectTest.java   |  382 +-
 .../apache/uima/json/JsonXmiCasSerializerTest.java |   76 +-
 .../resource/metadata/impl/TestFruitBagObject.java |  148 +-
 .../resource/metadata/impl/TestFruitObject.java    |  311 +-
 .../test/java/org/apache/uima/test/AllTypes.java   |   14 +-
 .../test/java/org/apache/uima/test/RefTypes.java   |    6 +-
 uimaj-parent/pom.xml                               |   37 +-
 uimaj-test-util/.gitignore                         |    2 +
 uimaj-test-util/pom.xml                            |   15 +-
 .../uima/test/junit_extension/TeePrintStream.java  |   24 +
 .../test/junit_extension/UIMAResultPrinter.java    |   14 +
 uimaj-tools/.gitignore                             |    2 +
 uimaj-tools/pom.xml                                |    2 +-
 .../uima/tools/AnnotationFeaturesViewer.java       |    2 -
 .../apache/uima/tools/AnnotationViewerMain.java    |    4 +-
 .../components/FileSystemCollectionReader.java     |    5 +
 .../tools/components/InlineXmlCasConsumer.java     |    2 +
 .../tools/components/XCasWriterCasConsumer.java    |    2 +
 .../tools/components/XmiWriterCasConsumer.java     |    2 +
 .../apache/uima/tools/components/XmlDetagger.java  |   10 +-
 .../java/org/apache/uima/tools/cpm/CpmFrame.java   |    2 +-
 .../java/org/apache/uima/tools/cpm/CpmPanel.java   | 4377 +++++-----
 .../uima/tools/cpm/JTabbedPaneWithCloseIcons.java  |    1 -
 .../apache/uima/tools/cpm/TabClosedListener.java   |    2 +-
 .../cvd/AnnotationDisplayCustomizationFrame.java   |    1 -
 .../apache/uima/tools/cvd/AnnotationExtent.java    |    1 -
 .../java/org/apache/uima/tools/cvd/ArrayNode.java  |    1 -
 .../main/java/org/apache/uima/tools/cvd/CVD.java   |  445 +-
 .../java/org/apache/uima/tools/cvd/ColorIcon.java  |    1 -
 .../java/org/apache/uima/tools/cvd/FSNode.java     |    2 -
 .../org/apache/uima/tools/cvd/FSTreeModel.java     |    1 -
 .../java/org/apache/uima/tools/cvd/FSTreeNode.java |    1 -
 .../org/apache/uima/tools/cvd/IndexTreeNode.java   |    2 -
 .../org/apache/uima/tools/cvd/LogFileViewer.java   |    1 -
 .../java/org/apache/uima/tools/cvd/MainFrame.java  | 5699 +++++++------
 .../org/apache/uima/tools/cvd/MarkupExtent.java    |    1 -
 .../uima/tools/cvd/MultiAnnotViewerFrame.java      |    1 -
 .../org/apache/uima/tools/cvd/RecentFilesList.java |  261 +-
 .../uima/tools/cvd/StringFsPopupEventAdapter.java  |  262 +-
 .../org/apache/uima/tools/cvd/TypeTreeNode.java    |    2 -
 .../cvd/control/AnnotatorOpenEventHandler.java     |    1 -
 .../tools/cvd/control/FileOpenEventHandler.java    |    1 -
 .../tools/cvd/control/FileSaveAsEventHandler.java  |    1 -
 .../tools/cvd/control/FileSaveEventHandler.java    |    1 -
 .../control/LoadRecentDescFileEventHandler.java    |    1 -
 .../control/LoadRecentTextFileEventHandler.java    |    1 -
 .../tools/cvd/control/NewTextEventHandler.java     |    1 -
 .../uima/tools/cvd/control/PopupHandler.java       |    1 -
 .../tools/cvd/control/SetLogConfigHandler.java     |    1 -
 .../uima/tools/cvd/control/TreeFocusHandler.java   |    1 -
 .../control/TypeSystemFileOpenEventHandler.java    |    1 -
 .../cvd/control/XCASFileOpenEventHandler.java      |    1 -
 .../tools/cvd/control/XmiCasFileOpenHandler.java   |  154 +-
 .../uima/tools/cvd/control/XmiCasSaveHandler.java  |  191 +-
 .../uima/tools/cvd/tsview/FeatureTableModel.java   |    2 -
 .../apache/uima/tools/cvd/tsview/MainFrame.java    |    1 -
 .../tools/docanalyzer/FileSelectorListener.java    |    2 +-
 .../java/org/apache/uima/tools/jcasgen/GUI.java    |    1 -
 .../java/org/apache/uima/tools/jcasgen/IError.java |    8 +-
 .../java/org/apache/uima/tools/jcasgen/IMerge.java |    2 +-
 .../uima/tools/jcasgen/IProgressMonitor.java       |    8 +-
 .../uima/tools/jcasgen/JCasTypeTemplate.java       |    4 +-
 .../java/org/apache/uima/tools/jcasgen/Jg.java     |    2 +-
 .../uima/tools/pear/install/InstallPear.java       |    1 -
 .../uima/tools/pear/merger/PMController.java       |  917 +--
 .../uima/tools/pear/merger/PMControllerHelper.java |  466 +-
 .../apache/uima/tools/pear/merger/PMUimaAgent.java |  724 +-
 .../uima/tools/pear/packager/PearPackager.java     |  414 +-
 .../tools/stylemap/AnnotationFeaturesViewer.java   |    2 -
 .../apache/uima/tools/stylemap/ColorRenderer.java  |    2 -
 .../uima/tools/util/gui/FileSelectorListener.java  |    2 +-
 .../apache/uima/tools/util/gui/IntegerField.java   |    2 -
 .../tools/util/gui/TransportControlListener.java   |    8 +-
 .../uima/tools/viewer/CasAnnotationViewer.java     |    1 -
 .../apache/uima/tools/viewer/CasTreeViewer.java    |    2 -
 .../apache/uima/tools/viewer/EntityResolver.java   |  134 +-
 .../uima/tools/pear/merger/PearMergerTest.java     |  290 +-
 .../uima/tools/viewer/CasAnnotationViewerTest.java |  648 +-
 uimaj-v3migration-jcas/pom.xml                     |    2 +-
 .../apache/uima/migratev3/jcas/MigrateJCas.java    | 7120 ++++++++---------
 .../apache/uima/cas/impl/AnnotationIndexImpl.java  |  442 +-
 .../cas/impl/FSIteratorWrapperDoubleCheck.java     |  312 +-
 .../apache/uima/cas/impl/FSListIteratorImpl.java   |  322 +-
 .../src/org/apache/uima/cas/impl/FSRBTIndex.java   |  302 +-
 .../org/apache/uima/cas/impl/FeatureArrayImpl.java |  118 +-
 .../apache/uima/cas/impl/FeatureGetter_int.java    |   52 +-
 .../apache/uima/cas/impl/FeatureGetter_ref.java    |   52 +-
 .../apache/uima/cas/impl/FeatureSetter_int.java    |   50 +-
 .../apache/uima/cas/impl/FeatureSetter_ref.java    |   50 +-
 .../uima/cas/impl/FeatureStructureClassGen.java    |  978 +--
 .../src/org/apache/uima/cas/impl/FsIndex_aggr.java |  466 +-
 .../uima/cas/impl/FsIterator_set_sorted.java       |  528 +-
 .../impl/FsIterator_set_sorted_navset_version.java |  540 +-
 .../apache/uima/cas/impl/FsIterator_subtypes.java  |  116 +-
 .../cas/impl/FsIterator_subtypes_list_unused.java  |   68 +-
 .../uima/cas/impl/JCasCoverClassFactoryTest.java   |  123 +-
 .../src/org/apache/uima/cas/impl/TypeImplList.java |   72 +-
 .../src/org/apache/uima/cas/impl/TypeImplMap.java  |   90 +-
 .../impl/XXXdont_use_JCasCoverClassFactory.java    | 1010 +--
 .../impl/JCasCoverClassFactoryTest.java            |  129 +-
 .../util/ComparableIntPointerIterator.java         |   94 +-
 .../apache/uima/internal/util/Int2IntHashMap.java  | 1034 +--
 .../uima/internal/util/Int2IntHashMapTest.java     |  179 +-
 .../apache/uima/internal/util/Int2IntPerfTest.java |  310 +-
 .../internal/util/UIMATypeSystemClassLoader.java   |  308 +-
 .../util/UIMATypeSystemClassLoaderInjector.java    |  238 +-
 .../org/apache/uima/jcas/cas/JavaObjectArray.java  |  386 +-
 .../src/org/apache/uima/jcas/impl/CASMetadata.java |   82 +-
 .../uima/jcas/impl/JCasCoverClassFactory.java      |  704 +-
 .../uima/jcas/impl/JCasCoverClassFactoryTest.java  |  122 +-
 .../src/org/apache/uima/jcas/impl/JCasHashMap.java |  888 +--
 .../uima/jcas/impl/JCasHashMapCompareTest.java     |  400 +-
 .../apache/uima/jcas/impl/JCasHashMapSubMap.java   |  836 +-
 .../org/apache/uima/jcas/impl/JCasHashMapTest.java |  945 +--
 .../apache/uima/jcasgen/JCasClassDefinition.java   |  134 +-
 .../uima/jcasgen/impl/JCasClassConversion.java     |  508 +-
 .../uima/tools/jcas/internal/AnalyzeContent.java   |  690 +-
 .../uima/tools/jcasgen/DecompiledFilter.java       |  312 +-
 .../src/study/asm/decompiled/AnnotationDumpV3.java |  568 +-
 3625 files changed, 232125 insertions(+), 130564 deletions(-)

diff --cc uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
index 55bdda5,a2e1254..c7e0f7d
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
@@@ -122,8 -121,9 +121,8 @@@ public class FlowControllerContainer ex
        // Set Logger, to enable component-specific logging configuration
        UimaContextAdmin uimaContext = getUimaContextAdmin();
        Logger logger = UIMAFramework.getLogger(mFlowController.getClass());
 -      logger.setResourceManager(this.getResourceManager());
        uimaContext.setLogger(logger);
-       
+ 
        Logger classLogger = getLogger();
        classLogger.logrb(Level.CONFIG, this.getClass().getName(), "initialize", LOG_RESOURCE_BUNDLE,
                "UIMA_flow_controller_init_begin__CONFIG", getMetaData().getName());
diff --cc uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
index 212f7ff,e37b0f4..b45b9a9
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
@@@ -233,21 -233,25 +232,22 @@@ public class PrimitiveAnalysisEngine_im
      } catch (ResourceInitializationException e) {
        throw e;
      } catch (Exception e) {
-       
+ 
        throw new ResourceInitializationException(
-               ResourceInitializationException.COULD_NOT_INSTANTIATE_ANNOTATOR, new Object[] {
-                   annotatorClassName, mDescription.getSourceUrlString() }, e);
+               ResourceInitializationException.COULD_NOT_INSTANTIATE_ANNOTATOR,
+               new Object[] { annotatorClassName, mDescription.getSourceUrlString() }, e);
      }
  
 -    // Set Logger, to enable annotator-specific logging
 -    UimaContextAdmin uimaContext = getUimaContextAdmin();
 -    Logger logger = UIMAFramework.getLogger(annotatorClass);
 -    logger.setResourceManager(this.getResourceManager());
 -    uimaContext.setLogger(logger);
 -
      // initialize AnalysisComponent
-     UimaContext prevContext = setContextHolder();  // for use by POJOs
+     UimaContext prevContext = setContextHolder(); // for use by POJOs
      try {
 +      // Set Logger, to enable annotator-specific logging
 +      getUimaContextAdmin().setLogger(UIMAFramework.getLogger(annotatorClass));
 +
        callInitializeMethod(mAnalysisComponent, getUimaContext());
- //      mAnalysisComponent.initialize(getUimaContext());
-       // set up the CAS pool for this AE (this won't do anything if mAnalysisComponent.getCasInstancesRequired() == 0)
+       // mAnalysisComponent.initialize(getUimaContext());
+       // set up the CAS pool for this AE (this won't do anything if
+       // mAnalysisComponent.getCasInstancesRequired() == 0)
        getUimaContextAdmin().defineCasPool(mAnalysisComponent.getCasInstancesRequired(),
                getPerformanceTuningSettings(), mSofaAware);
      } catch (Exception e) {
diff --cc uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
index 3d1b65d,038bcb2..524b398
--- a/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
@@@ -89,13 -90,13 +90,13 @@@ public abstract class Resource_ImplBas
      if (aAdditionalParams != null) {
        mUimaContextAdmin = (UimaContextAdmin) aAdditionalParams.get(PARAM_UIMA_CONTEXT);
      }
 -    if (mUimaContextAdmin == null) {// no, we have to create one
  
-     if (mUimaContextAdmin == null) {// no, we have to create one    
++    if (mUimaContextAdmin == null) { // no, we have to create one
        // skip this part if initializing an external resource
        // https://issues.apache.org/jira/browse/UIMA-5153
-       if (!(aSpecifier instanceof ConfigurableDataResourceSpecifier) &&
-           !(aSpecifier instanceof FileLanguageResourceSpecifier) &&
-           !(aSpecifier instanceof FileResourceSpecifier)) {
+       if (!(aSpecifier instanceof ConfigurableDataResourceSpecifier)
+               && !(aSpecifier instanceof FileLanguageResourceSpecifier)
+               && !(aSpecifier instanceof FileResourceSpecifier)) {
          // get or create ResourceManager
          ResourceManager resMgr = null;
          if (aAdditionalParams != null) {
diff --cc uimaj-core/src/main/java/org/apache/uima/util/Logger.java
index 174d62e,0d0d2ee..b10b4ae
--- a/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
@@@ -291,24 -298,19 +299,28 @@@ public interface Logger extends org.slf
     * @param resourceManager
     *          A resource manager instance whose extension ClassLoader (if any) will be used for
     *          message localization by this logger.
 +   * @deprecated When a logger is used within UIMA, the resource manager is picked up from the
 +   *             {@link UimaContextHolder} and if none is available, then the class loader set on
 +   *             the {@link Thread#getContextClassLoader()} is used. Thus, setting a resource
 +   *             manager for loading message localizations should not be required. Setting a
 +   *             resource manager anyway can lead to resource being registered in the resource
 +   *             manager to not be garbage collected in a timely manner. Also, the logger is shared
 +   *             globally and in a multi-threaded/multi-classloader scenario, it is likely that
 +   *             different threads overwrite each others logger resource manager making it likely
 +   *             that in any given thread the wrong resource manager is used by the logger.
     */
 -  void setResourceManager(ResourceManager resourceManager);
 +  @Deprecated void setResourceManager(ResourceManager resourceManager);
  
    /**
-    * Get an internationalized message from a resource bundle by key name, substituting the parameters.
-    * This should be called via a Supplier to avoid computing this until needed
-    * @param resourceBundle -
-    * @param key -
-    * @param params -
+    * Get an internationalized message from a resource bundle by key name, substituting the
+    * parameters. This should be called via a Supplier to avoid computing this until needed
+    * 
+    * @param resourceBundle
+    *          -
+    * @param key
+    *          -
+    * @param params
+    *          -
     * @return the internationalized message
     */
    String rb(String resourceBundle, String key, Object... params);
diff --cc uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
index 6a71496,c862a43..1d4c86b
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
@@@ -1,1238 -1,1276 +1,1309 @@@
 -/*
 - * Licensed to the Apache Software Foundation (ASF) under one
 - * or more contributor license agreements.  See the NOTICE file
 - * distributed with this work for additional information
 - * regarding copyright ownership.  The ASF licenses this file
 - * to you under the Apache License, Version 2.0 (the
 - * "License"); you may not use this file except in compliance
 - * with the License.  You may obtain a copy of the License at
 - * 
 - *   http://www.apache.org/licenses/LICENSE-2.0
 - * 
 - * Unless required by applicable law or agreed to in writing,
 - * software distributed under the License is distributed on an
 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 - * KIND, either express or implied.  See the License for the
 - * specific language governing permissions and limitations
 - * under the License.
 - */
 -
 -package org.apache.uima.util.impl;
 -
 -import java.io.OutputStream;
 -import java.io.PrintStream;
 -import java.text.MessageFormat;
 -import java.util.function.Supplier;
 -
 -import org.apache.uima.internal.util.I18nUtil;
 -import org.apache.uima.internal.util.Misc;
 -import org.apache.uima.resource.ResourceManager;
 -import org.apache.uima.util.Level;
 -import org.apache.uima.util.Logger;
 -import org.slf4j.Marker;
 -
 -/**
 - * UIMA Logging interface common implementation Specific loggers extend this class
 - * <p>
 - * Logging "location" information:
 - * <ul>
 - * <li>This is the Classname / Methodname / and maybe line number where the logging statement
 - * is</li>
 - * <li>is passed in on the logrb calls, but is not needed by modern loggers.</li>
 - * <li>In V3, passed in value is ignored; loggers get what they need as configured.</li>
 - * <li>In Java 9 this will be efficient</li>
 - * </ul>
 - * 
 - * <p>
 - * Limiting or throttling loggers: This is normally done using logger configuration. For cases where
 - * UIMA is running as an embedded library, sometimes Annotators log excessivly, and users do not
 - * have access to the logging configuration. But they do have access to APIs which create the UIMA
 - * pipelines.
 - * <p>
 - * V3 supports an additional param, AnalysisEngine.PARAM_THROTTLE_EXCESSIVE_ANNOTATOR_LOGGING which
 - * if set, specifies a limit of the number of log messages issued by Annotator code.
 - * <p>
 - * This requires:
 - * <ul>
 - * <li>marking loggers if they are Annotator loggers (e.g., their associated "class" used in setting
 - * the name of the logger, is assignable to AnalysisComponent_ImplBase, which includes: Annotators,
 - * CasMultipliers, and UimacppAnalysisComponents.</li>
 - * <li>When setting up a logger in the UimaContext logger code (via setLogger), checking if the
 - * logger is an Annotator logger, and if so, setting the limit on it from the parameter associated
 - * with the UIMA context.</li>
 - * </ul>
 - * 
 - * <p>
 - * The loggers with a limit are cloned for the particular pipeline (represented by the root UIMA
 - * context), so that setting the limit only affects one pipeline.
 - * 
 - * <p>
 - * The common part of logging does:
 - * <ul>
 - * <li>optional throttling</li>
 - * <li>the UIMA specific resource bundle message conversions</li>
 - * <li>the conversion of variants of log methods to standard ones</li>
 - * </ul>
 - * 
 - */
 -public abstract class Logger_common_impl implements Logger {
 -  protected static final String EXCEPTION_MESSAGE = "Exception occurred";
 -  protected static final String[] EMPTY_STACK_TRACE_INFO = new String[] { null, null };
 -
 -  protected final String fqcn = this.getClass().getName(); // the subclass name
 -  protected final String fqcnCmn = Logger_common_impl.class.getName(); // this class
 -
 -  // for throttling misbehaving Annotator Loggers
 -  private int SEVERE_COUNT = 0;
 -  private int WARNING_COUNT = 0;
 -  private int INFO_COUNT = 0;
 -  private int CONFIG_COUNT = 0;
 -  private int FINE_COUNT = 0;
 -  private int FINER_COUNT = 0;
 -  private int FINEST_COUNT = 0;
 -
 -  protected final int limit_common;
 -  private final boolean isLimited; // master switch tested first
 -
 -  /**
 -   * ResourceManager whose extension ClassLoader will be used to locate the message digests. Null
 -   * will cause the ClassLoader to default to this.class.getClassLoader().
 -   */
 -  private ResourceManager mResourceManager = null;
 -  private boolean isAnnotatorLogger;
 -
 -  protected Logger_common_impl(Class<?> component) {
 -    this.limit_common = Integer.MAX_VALUE;
 -    this.isLimited = false;
 -  }
 -
 -  /**
 -   * Copy constructor for limited loggers
 -   * 
 -   * @param lci
 -   *          the original logger to copy
 -   * @param limit
 -   *          the limit
 -   */
 -  protected Logger_common_impl(Logger_common_impl lci, int limit) {
 -    this.limit_common = limit;
 -    this.isLimited = true;
 -    this.isAnnotatorLogger = true;
 -    this.mResourceManager = lci.mResourceManager;
 -  }
 -
 -  /*********************************************
 -   * Abstract methods not in Uima Logger interface that must be implemented by subclasses
 -   *********************************************/
 -
 -  /**
 -   * The main log call implemented by subclasses
 -   * 
 -   * @param m
 -   *          the marker
 -   * @param aFqcn
 -   *          the fully qualified class name of the top-most logging class used to filter the stack
 -   *          trace to get the caller class / method info
 -   * @param level
 -   *          the UIMA level
 -   * @param message
 -   *          -
 -   * @param args
 -   *          - arguments to be substituted into the message
 -   * @param throwable
 -   *          - can be null
 -   */
 -  public abstract void log(Marker m, String aFqcn, Level level, String message, Object[] args,
 -          Throwable throwable);
 -
 -  /**
 -   * The version of the main log call implemented by subclasses that uses {}, not {n} as the
 -   * substitutable syntax.
 -   * 
 -   * This syntax is used by log4j, slf4j, and others. But not used by uimaj logger basic syntax, or
 -   * Java Util Logger.
 -   *
 -   * This version is called by all new logging statments that don't need to be backwards compatible.
 -   * e.g. logger.info, logger.error, logger.warn, etc.
 -   * 
 -   * @param m
 -   *          the marker
 -   * @param aFqcn
 -   *          the fully qualified class name of the top-most logging class used to filter the stack
 -   *          trace to get the caller class / method info
 -   * @param level
 -   *          the UIMA level
 -   * @param message
 -   *          -
 -   * @param args
 -   *          - arguments to be substituted into the message
 -   * @param throwable
 -   *          - can be null
 -   */
 -  public abstract void log2(Marker m, String aFqcn, Level level, String message, Object[] args,
 -          Throwable throwable);
 -
 -  /**
 -   * The version of the main log call implemented by subclasses that skips the substitution because
 -   * it already was done by rb()
 -   * 
 -   * @param m
 -   *          the marker
 -   * @param aFqcn
 -   *          the fully qualified class name of the top-most logging class used to filter the stack
 -   *          trace to get the caller class / method info
 -   * @param level
 -   *          the UIMA level
 -   * @param message
 -   *          -
 -   * @param throwable
 -   *          - can be null
 -   */
 -  public abstract void log(Marker m, String aFqcn, Level level, String message,
 -          Throwable throwable);
 -
 -  /**
 -   * @param level
 -   *          the Uima Level
 -   * @return the Marker to use
 -   */
 -  public static Marker getMarkerForLevel(Level level) {
 -    switch (level.toInteger()) {
 -      case Level.CONFIG_INT:
 -        return UIMA_MARKER_CONFIG;
 -      case Level.FINEST_INT:
 -        return UIMA_MARKER_FINEST;
 -      default:
 -        return null;
 -    }
 -  }
 -
 -  /**
 -   * Convert a standard UIMA call for wrapped loggers
 -   * 
 -   * @param aFqcn
 -   *          - fully qualified class name of highest level of logging impl. The class / method
 -   *          above this in the stack trace is used for identifying where the logging call
 -   *          originated from.
 -   * @param level
 -   *          the uima Level
 -   * @param message
 -   *          the message
 -   * @param thrown
 -   *          may be null
 -   */
 -  @Override
 -  public void log(String aFqcn, Level level, String message, Throwable thrown) {
 -    // log(getMarkerForLevel(level), aFqcn, level, message, null, thrown);
 -    log(getMarkerForLevel(level), aFqcn, level, message, thrown);
 -  }
 -
 -  /**
 -   * 
 -   * @param level
 -   *          -
 -   * @return true if not limited
 -   */
 -  private boolean isNotLimited(Level level) {
 -    if (!isLimited) {
 -      return true;
 -    }
 -    switch (level.toInteger()) {
 -      case Level.SEVERE_INT:
 -        if (SEVERE_COUNT >= limit_common)
 -          return false;
 -        SEVERE_COUNT++;
 -        return true;
 -      case Level.WARNING_INT:
 -        if (WARNING_COUNT >= limit_common)
 -          return false;
 -        WARNING_COUNT++;
 -        return true;
 -      case Level.INFO_INT:
 -        if (INFO_COUNT >= limit_common)
 -          return false;
 -        INFO_COUNT++;
 -        return true;
 -      case Level.CONFIG_INT:
 -        if (CONFIG_COUNT >= limit_common)
 -          return false;
 -        CONFIG_COUNT++;
 -        return true;
 -      case Level.FINE_INT:
 -        if (FINE_COUNT >= limit_common)
 -          return false;
 -        FINE_COUNT++;
 -        return true;
 -      case Level.FINER_INT:
 -        if (FINER_COUNT >= limit_common)
 -          return false;
 -        FINER_COUNT++;
 -        return true;
 -      case Level.FINEST_INT:
 -        if (FINEST_COUNT >= limit_common)
 -          return false;
 -        FINEST_COUNT++;
 -        return true;
 -    }
 -    Misc.internalError();
 -    return false;
 -  }
 -
 -  /**
 -   * @see org.apache.uima.util.Logger#setOutputStream(java.io.OutputStream)
 -   * 
 -   * @deprecated use external configuration possibility
 -   */
 -  @Override
 -  @Deprecated
 -  public void setOutputStream(OutputStream out) {
 -    throw new UnsupportedOperationException();
 -  }
 -
 -  /**
 -   * @see org.apache.uima.util.Logger#setOutputStream(java.io.PrintStream)
 -   * 
 -   * @deprecated use external configuration possibility
 -   */
 -  @Override
 -  @Deprecated
 -  public void setOutputStream(PrintStream out) {
 -    throw new UnsupportedOperationException();
 -  }
 -
 -  /**
 -   * Logs a message with level INFO.
 -   * 
 -   * @deprecated use new function with log level
 -   * 
 -   * @param aMessage
 -   *          the message to be logged
 -   */
 -  @Override
 -  @Deprecated
 -  public void log(String aMessage) {
 -    if (isLoggable(Level.INFO) && !isEmpty(aMessage) && isNotLimited(Level.INFO)) {
 -      log(fqcnCmn, Level.INFO, aMessage, null);
 -    }
 -  }
 -
 -  /**
 -   * Logs a message with a message key and the level INFO
 -   * 
 -   * @deprecated use new function with log level
 -   * 
 -   * @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
 -   */
 -  @Override
 -  @Deprecated
 -  public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
 -    if (isLoggable(Level.INFO) && !isEmpty(aMessageKey) && isNotLimited(Level.INFO)) {
 -      log(fqcnCmn, Level.INFO, rb(aResourceBundleName, aMessageKey, aArguments), null);
 -    }
 -  }
 -
 -  /**
 -   * Logs an exception with level INFO
 -   * 
 -   * @deprecated use new function with log level
 -   * 
 -   * @param aException
 -   *          the exception to be logged
 -   */
 -  @Override
 -  @Deprecated
 -  public void logException(Exception aException) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO) && aException != null) {
 -      log(fqcnCmn, Level.INFO, EXCEPTION_MESSAGE, aException);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String)
 -   */
 -  @Override
 -  public void log(Level level, String aMessage) {
 -    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 -      log(fqcnCmn, level, aMessage, null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.Object)
 -   */
 -  @Override
 -  public void log(Level level, String aMessage, Object param1) {
 -    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 -      log(fqcnCmn, level, MessageFormat.format(aMessage, new Object[] { param1 }), null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.Object[])
 -   */
 -  @Override
 -  public void log(Level level, String aMessage, Object[] params) {
 -    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 -      log(fqcnCmn, level, MessageFormat.format(aMessage, params), null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.Throwable)
 -   */
 -  @Override
 -  public void log(Level level, String aMessage, Throwable thrown) {
 -    if (isLoggable(level) && isNotLimited(level)) {
 -      log(fqcnCmn, level, (aMessage != null && !aMessage.equals("")) ? aMessage : EXCEPTION_MESSAGE,
 -              thrown);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.String, java.lang.String, java.lang.String, java.lang.Object)
 -   */
 -  @Override
 -  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 -          String msgKey, Object param1) {
 -    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 -      log(fqcnCmn, level, rb(bundleName, msgKey, param1), null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.String, java.lang.String, java.lang.String, java.lang.Object[])
 -   */
 -  @Override
 -  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 -          String msgKey, Object[] params) {
 -    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 -      log(fqcnCmn, level, rb(bundleName, msgKey, params), null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)
 -   */
 -  @Override
 -  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 -          String msgKey, Throwable thrown) {
 -    if (isLoggable(level) && isNotLimited(level)) {
 -      if (thrown == null && isEmpty(msgKey)) {
 -        return;
 -      }
 -      log(fqcnCmn, level,
 -              (msgKey != null && !msgKey.equals("")) ? rb(bundleName, msgKey) : EXCEPTION_MESSAGE,
 -              thrown);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
 -   * java.lang.String, java.lang.String, java.lang.String)
 -   */
 -  @Override
 -  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 -          String msgKey) {
 -    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 -      log(fqcnCmn, level, rb(bundleName, msgKey), null);
 -    }
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#setResourceManager(org.apache.uima.resource.ResourceManager)
 -   */
 -  @Override
 -  public void setResourceManager(ResourceManager resourceManager) {
 -    mResourceManager = resourceManager;
 -  }
 -
 -  /**
 -   * Gets the extension ClassLoader to used to locate the message digests. If this returns null,
 -   * then message digests will be searched for using this.class.getClassLoader().
 -   */
 -  private ClassLoader getExtensionClassLoader() {
 -    if (mResourceManager == null)
 -      return null;
 -    else
 -      return mResourceManager.getExtensionClassLoader();
 -  }
 -
 -  /*
 -   * (non-Javadoc)
 -   * 
 -   * @see org.apache.uima.util.Logger#rb(String, String, Object...)
 -   */
 -  @Override
 -  public String rb(String bundleName, String msgKey, Object... parameters) {
 -    return I18nUtil.localizeMessage(bundleName, msgKey, parameters, getExtensionClassLoader());
 -  }
 -
 -  protected boolean isEmpty(String v) {
 -    return (v == null || v.equals(""));
 -  }
 -
 -  @Override
 -  public boolean isAnnotatorLogger() {
 -    return isAnnotatorLogger;
 -  }
 -
 -  public void setAnnotatorLogger(boolean v) {
 -    isAnnotatorLogger = v;
 -  }
 -
 -  private Object[] suppliersToArray(Supplier<?>[] suppliers) {
 -    Object[] r = new Object[suppliers.length];
 -    int i = 0;
 -    for (Supplier<?> s : suppliers) {
 -      r[i++] = s.get();
 -    }
 -    return r;
 -  }
 -
 -  /************************************************
 -   * Convert standard call varieties
 -   ************************************************/
 -
 -  @Override
 -  public void debug(String arg0) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, arg0, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(String arg0, Object arg1) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] { arg1 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(String arg0, Object... arg1) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, arg0, arg1, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(String arg0, Throwable arg1) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, arg0, null, arg1);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(Marker arg0, String arg1) {
 -    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 -      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(String arg0, Object arg1, Object arg2) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] { arg1, arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(Marker arg0, String arg1, Object arg2) {
 -    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 -      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] { arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(Marker arg0, String arg1, Object... arg2) {
 -    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 -      log2(arg0, fqcnCmn, Level.DEBUG, arg1, arg2, null);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(Marker arg0, String arg1, Throwable arg2) {
 -    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 -      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, arg2);
 -    }
 -  }
 -
 -  @Override
 -  public void debug(Marker arg0, String arg1, Object arg2, Object arg3) {
 -    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 -      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] { arg2, arg3 }, null);
 -    }
 -  }
 -
 -  // methods from log4j 2 using Java 8 suppliers
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void debug(Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   * @param throwable
 -   *          the exception to log
 -   */
 -  @Override
 -  public void debug(Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void debug(Marker marker, String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
 -      log2(marker, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void debug(String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 -      log2(null, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void debug(Marker marker, Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
 -      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void debug(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
 -      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  // ---------------------- ERROR
 -
 -  @Override
 -  public void error(String arg0) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, arg0, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(String arg0, Object arg1) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] { arg1 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(String arg0, Object... arg1) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, arg0, arg1, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(String arg0, Throwable arg1) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, arg0, null, arg1);
 -    }
 -  }
 -
 -  @Override
 -  public void error(Marker arg0, String arg1) {
 -    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 -      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(String arg0, Object arg1, Object arg2) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] { arg1, arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(Marker arg0, String arg1, Object arg2) {
 -    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 -      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] { arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(Marker arg0, String arg1, Object... arg2) {
 -    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 -      log2(arg0, fqcnCmn, Level.ERROR, arg1, arg2, null);
 -    }
 -  }
 -
 -  @Override
 -  public void error(Marker arg0, String arg1, Throwable arg2) {
 -    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 -      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, arg2);
 -    }
 -  }
 -
 -  @Override
 -  public void error(Marker arg0, String arg1, Object arg2, Object arg3) {
 -    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 -      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] { arg2, arg3 }, null);
 -    }
 -  }
 -
 -  // methods from log4j 2 using Java 8 suppliers
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void error(Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   * @param throwable
 -   *          the exception to log
 -   */
 -  @Override
 -  public void error(Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void error(Marker marker, String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 -      log2(marker, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void error(String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 -      log2(null, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void error(Marker marker, Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 -      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void error(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 -      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  // ---------------------- INFO
 -
 -  @Override
 -  public void info(String arg0) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, arg0, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(String arg0, Object arg1) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(String arg0, Object... arg1) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, arg0, arg1, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(String arg0, Throwable arg1) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, arg0, null, arg1);
 -    }
 -  }
 -
 -  @Override
 -  public void info(Marker arg0, String arg1) {
 -    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 -      log2(arg0, fqcnCmn, Level.INFO, arg1, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(String arg0, Object arg1, Object arg2) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1, arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(Marker arg0, String arg1, Object arg2) {
 -    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 -      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(Marker arg0, String arg1, Object... arg2) {
 -    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 -      log2(arg0, fqcnCmn, Level.INFO, arg1, arg2, null);
 -    }
 -  }
 -
 -  @Override
 -  public void info(Marker arg0, String arg1, Throwable arg2) {
 -    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 -      log2(arg0, fqcnCmn, Level.INFO, arg1, null, arg2);
 -    }
 -  }
 -
 -  @Override
 -  public void info(Marker arg0, String arg1, Object arg2, Object arg3) {
 -    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 -      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2, arg3 }, null);
 -    }
 -  }
 -
 -  // methods from log4j 2 using Java 8 suppliers
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void info(Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   * @param throwable
 -   *          the exception to log
 -   */
 -  @Override
 -  public void info(Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void info(Marker marker, String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 -      log2(marker, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  public void info(String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 -      log2(null, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void info(Marker marker, Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 -      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void info(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 -      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  // ---------------------- TRACE
 -
 -  @Override
 -  public void trace(String arg0) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, arg0, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(String arg0, Object arg1) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(String arg0, Object... arg1) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, arg0, arg1, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(String arg0, Throwable arg1) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, arg0, null, arg1);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(Marker arg0, String arg1) {
 -    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 -      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(String arg0, Object arg1, Object arg2) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1, arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(Marker arg0, String arg1, Object arg2) {
 -    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 -      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(Marker arg0, String arg1, Object... arg2) {
 -    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 -      log2(arg0, fqcnCmn, Level.TRACE, arg1, arg2, null);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(Marker arg0, String arg1, Throwable arg2) {
 -    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 -      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, arg2);
 -    }
 -  }
 -
 -  @Override
 -  public void trace(Marker arg0, String arg1, Object arg2, Object arg3) {
 -    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 -      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2, arg3 }, null);
 -    }
 -  }
 -
 -  // methods from log4j 2 using Java 8 suppliers
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void trace(Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   * @param throwable
 -   *          the exception to log
 -   */
 -  @Override
 -  public void trace(Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void trace(Marker marker, String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 -      log2(marker, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void trace(String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 -      log2(null, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void trace(Marker marker, Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 -      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void trace(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 -      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  // ---------------------- WARN
 -  @Override
 -  public void warn(String arg0) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, arg0, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(String arg0, Object arg1) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(String arg0, Object... arg1) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, arg0, arg1, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(String arg0, Throwable arg1) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, arg0, null, arg1);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(Marker arg0, String arg1) {
 -    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 -      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(String arg0, Object arg1, Object arg2) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1, arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(Marker arg0, String arg1, Object arg2) {
 -    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 -      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(Marker arg0, String arg1, Object... arg2) {
 -    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 -      log2(arg0, fqcnCmn, Level.WARNING, arg1, arg2, null);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(Marker arg0, String arg1, Throwable arg2) {
 -    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 -      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, arg2);
 -    }
 -  }
 -
 -  @Override
 -  public void warn(Marker arg0, String arg1, Object arg2, Object arg3) {
 -    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 -      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2, arg3 }, null);
 -    }
 -  }
 -
 -  // methods from log4j 2 using Java 8 suppliers
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void warn(Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   * @param throwable
 -   *          the exception to log
 -   */
 -  @Override
 -  public void warn(Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 -      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void warn(Marker marker, String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 -      log2(marker, fqcnCmn, Level.WARNING, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param message
 -   *          the message to log
 -   * @param paramSuppliers
 -   *          An array of functions, which when called, produce the desired log message parameters.
 -   */
 -  @Override
 -  public void warn(String message, Supplier<?>... paramSuppliers) {
 -    if (isLoggable(Level.WARN) && isNotLimited(Level.WARN)) {
 -      log2(null, fqcnCmn, Level.WARN, message, suppliersToArray(paramSuppliers), null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void warn(Marker marker, Supplier<String> msgSupplier) {
 -    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 -      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
 -    }
 -  }
 -
 -  /**
 -   * @param marker
 -   *          the marker data specific to this log statement
 -   * @param msgSupplier
 -   *          A function, which when called, produces the desired log message
 -   */
 -  @Override
 -  public void warn(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 -    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 -      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
 -    }
 -  }
 -
 -}
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + * 
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + * 
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +
 +package org.apache.uima.util.impl;
 +
 +import java.io.OutputStream;
 +import java.io.PrintStream;
 +import java.text.MessageFormat;
 +import java.util.concurrent.atomic.AtomicInteger;
 +import java.util.function.Supplier;
 +
 +import org.apache.uima.UIMAFramework;
 +import org.apache.uima.UimaContext;
 +import org.apache.uima.UimaContextAdmin;
 +import org.apache.uima.UimaContextHolder;
 +import org.apache.uima.internal.util.I18nUtil;
 +import org.apache.uima.internal.util.Misc;
 +import org.apache.uima.resource.ResourceManager;
 +import org.apache.uima.util.Level;
 +import org.apache.uima.util.Logger;
 +import org.slf4j.Marker;
 +
 +/**
-  * UIMA Logging interface common implementation
-  * Specific loggers extend this class
++ * UIMA Logging interface common implementation Specific loggers extend this class
 + * <p>
 + * Logging "location" information:
-  * <ul><li>This is the Classname / Methodname / and maybe line number where the logging statement is</li>
-  *   <li>is passed in on the logrb calls, but is not needed by modern loggers.</li>
-  *   <li>In V3, passed in value is ignored; loggers get what they need as configured.</li>
-  *   <li>In Java 9 this will be efficient</li>
++ * <ul>
++ * <li>This is the Classname / Methodname / and maybe line number where the logging statement
++ * is</li>
++ * <li>is passed in on the logrb calls, but is not needed by modern loggers.</li>
++ * <li>In V3, passed in value is ignored; loggers get what they need as configured.</li>
++ * <li>In Java 9 this will be efficient</li>
 + * </ul>
 + * 
 + * <p>
-  * Limiting or throttling loggers:
-  * This is normally done using logger configuration.  For cases where UIMA is running as an 
-  * embedded library, sometimes Annotators log excessivly, and users do not have access to 
-  * the logging configuration.  But they do have access to APIs which create the UIMA pipelines.
++ * Limiting or throttling loggers: This is normally done using logger configuration. For cases where
++ * UIMA is running as an embedded library, sometimes Annotators log excessivly, and users do not
++ * have access to the logging configuration. But they do have access to APIs which create the UIMA
++ * pipelines.
 + * <p>
-  * V3 supports an additional param, AnalysisEngine.PARAM_THROTTLE_EXCESSIVE_ANNOTATOR_LOGGING
-  * which if set, specifies a limit of the number of log messages issued by Annotator code.
++ * V3 supports an additional param, AnalysisEngine.PARAM_THROTTLE_EXCESSIVE_ANNOTATOR_LOGGING which
++ * if set, specifies a limit of the number of log messages issued by Annotator code.
 + * <p>
-  * This requires: 
-  * <ul><li>marking loggers if they are Annotator loggers (e.g., their associated "class" used
-  * in setting the name of the logger, is assignable to AnalysisComponent_ImplBase,
-  * which includes: Annotators, CasMultipliers, and UimacppAnalysisComponents.
-  * </li>
-  * <li>When setting up a logger in the UimaContext logger code (via setLogger), checking if the logger
-  * is an Annotator logger, and if so, setting the limit on it from the parameter associated with
-  * the UIMA context.
-  * </li>
++ * This requires:
++ * <ul>
++ * <li>marking loggers if they are Annotator loggers (e.g., their associated "class" used in setting
++ * the name of the logger, is assignable to AnalysisComponent_ImplBase, which includes: Annotators,
++ * CasMultipliers, and UimacppAnalysisComponents.</li>
++ * <li>When setting up a logger in the UimaContext logger code (via setLogger), checking if the
++ * logger is an Annotator logger, and if so, setting the limit on it from the parameter associated
++ * with the UIMA context.</li>
 + * </ul>
 + * 
-  * <p>The loggers with a limit are cloned for the particular pipeline (represented by the 
-  * root UIMA context), so that setting the limit only affects one pipeline.
++ * <p>
++ * The loggers with a limit are cloned for the particular pipeline (represented by the root UIMA
++ * context), so that setting the limit only affects one pipeline.
 + * 
-  * <p>The common part of logging does:
-  *   <ul><li>optional throttling</li>
-  *   <li>the UIMA specific resource bundle message conversions</li>
-  *   <li>the conversion of variants of log methods to standard ones</li>
-  *  </ul>
++ * <p>
++ * The common part of logging does:
++ * <ul>
++ * <li>optional throttling</li>
++ * <li>the UIMA specific resource bundle message conversions</li>
++ * <li>the conversion of variants of log methods to standard ones</li>
++ * </ul>
 + * 
 + */
 +public abstract class Logger_common_impl implements Logger {
 +  protected static final String EXCEPTION_MESSAGE = "Exception occurred";
-   protected static final String[] EMPTY_STACK_TRACE_INFO = new String[] {null, null};
-    
-   protected final String fqcn =  this.getClass().getName(); // the subclass name
-   protected final String fqcnCmn = Logger_common_impl.class.getName();  // this class
++  protected static final String[] EMPTY_STACK_TRACE_INFO = new String[] { null, null };
++
++  protected final String fqcn = this.getClass().getName(); // the subclass name
++  protected final String fqcnCmn = Logger_common_impl.class.getName(); // this class
 +
-   // for throttling misbehaving Annotator Loggers  
++  // for throttling misbehaving Annotator Loggers
 +  private int SEVERE_COUNT = 0;
 +  private int WARNING_COUNT = 0;
 +  private int INFO_COUNT = 0;
 +  private int CONFIG_COUNT = 0;
 +  private int FINE_COUNT = 0;
 +  private int FINER_COUNT = 0;
 +  private int FINEST_COUNT = 0;
-   
++
 +  protected final int limit_common;
 +  private final boolean isLimited; // master switch tested first
 +  private final AtomicInteger dontSetResourceManagerCount = new AtomicInteger();
 +
 +  /**
 +   * ResourceManager whose extension ClassLoader will be used to locate the message digests. Null
 +   * will cause the ClassLoader to default to this.class.getClassLoader().
 +   * 
 +   * @Deprecated When a logger is used within UIMA, the resource manager is picked up from the
 +   *             {@link UimaContextHolder} and if none is available, then the class loader set on
 +   *             the {@link Thread#getContextClassLoader()} is used. Thus, setting a resource
 +   *             manager for loading message localizations should not be required. Setting a
 +   *             resource manager anyway can lead to resource being registered in the resource
 +   *             manager to not be garbage collected in a timely manner. Also, the logger is shared
 +   *             globally and in a multi-threaded/multi-classloader scenario, it is likely that
 +   *             different threads overwrite each others logger resource manager making it likely
 +   *             that in any given thread the wrong resource manager is used by the logger.
 +   */
 +  private ResourceManager mResourceManager = null;
 +  private boolean isAnnotatorLogger;
-     
++
 +  protected Logger_common_impl(Class<?> component) {
 +    this.limit_common = Integer.MAX_VALUE;
 +    this.isLimited = false;
 +  }
-   
++
 +  /**
 +   * Copy constructor for limited loggers
-    * @param lci the original logger to copy
-    * @param limit the limit
++   * 
++   * @param lci
++   *          the original logger to copy
++   * @param limit
++   *          the limit
 +   */
 +  protected Logger_common_impl(Logger_common_impl lci, int limit) {
 +    this.limit_common = limit;
 +    this.isLimited = true;
 +    this.isAnnotatorLogger = true;
 +    this.mResourceManager = lci.mResourceManager;
-   }   
-   
++  }
++
 +  /*********************************************
 +   * Abstract methods not in UIMA Logger interface that must be implemented by subclasses
 +   *********************************************/
 +
 +  /**
 +   * The main log call implemented by subclasses
-    * @param m the marker
-    * @param aFqcn the fully qualified class name of the top-most logging class used
-    *                   to filter the stack trace to get the caller class / method info
-    * @param level the UIMA level
-    * @param message -
-    * @param args - arguments to be substituted into the message
-    * @param throwable - can be null
++   * 
++   * @param m
++   *          the marker
++   * @param aFqcn
++   *          the fully qualified class name of the top-most logging class used to filter the stack
++   *          trace to get the caller class / method info
++   * @param level
++   *          the UIMA level
++   * @param message
++   *          -
++   * @param args
++   *          - arguments to be substituted into the message
++   * @param throwable
++   *          - can be null
 +   */
-   public abstract void log(Marker m, String aFqcn, Level level, 
-                            String message, Object[] args, Throwable throwable);
-   
++  public abstract void log(Marker m, String aFqcn, Level level, String message, Object[] args,
++          Throwable throwable);
++
 +  /**
-    * The version of the main log call implemented by subclasses that uses {}, not {n} as the substitutable syntax.
++   * The version of the main log call implemented by subclasses that uses {}, not {n} as the
++   * substitutable syntax.
 +   * 
-    * This syntax is used by log4j, slf4j, and others.  But not used by uimaj logger basic syntax, or 
++   * This syntax is used by log4j, slf4j, and others. But not used by uimaj logger basic syntax, or
 +   * Java Util Logger.
 +   *
 +   * This version is called by all new logging statments that don't need to be backwards compatible.
 +   * e.g. logger.info, logger.error, logger.warn, etc.
 +   * 
-    * @param m the marker
-    * @param aFqcn the fully qualified class name of the top-most logging class used
-    *                   to filter the stack trace to get the caller class / method info
-    * @param level the UIMA level
-    * @param message -
-    * @param args - arguments to be substituted into the message
-    * @param throwable - can be null
++   * @param m
++   *          the marker
++   * @param aFqcn
++   *          the fully qualified class name of the top-most logging class used to filter the stack
++   *          trace to get the caller class / method info
++   * @param level
++   *          the UIMA level
++   * @param message
++   *          -
++   * @param args
++   *          - arguments to be substituted into the message
++   * @param throwable
++   *          - can be null
 +   */
-   public abstract void log2(Marker m, String aFqcn, Level level,
-                            String message, Object[] args, Throwable throwable);
-   
++  public abstract void log2(Marker m, String aFqcn, Level level, String message, Object[] args,
++          Throwable throwable);
++
 +  /**
-    * The version of the main log call implemented by subclasses that skips the substitution
-    *   because it already was done by rb() 
++   * The version of the main log call implemented by subclasses that skips the substitution because
++   * it already was done by rb()
 +   * 
-    * @param m the marker
-    * @param aFqcn the fully qualified class name of the top-most logging class used
-    *                   to filter the stack trace to get the caller class / method info
-    * @param level the UIMA level
-    * @param message -
-    * @param throwable - can be null
++   * @param m
++   *          the marker
++   * @param aFqcn
++   *          the fully qualified class name of the top-most logging class used to filter the stack
++   *          trace to get the caller class / method info
++   * @param level
++   *          the UIMA level
++   * @param message
++   *          -
++   * @param throwable
++   *          - can be null
 +   */
-   public abstract void log(Marker m, String aFqcn, Level level,
-                            String message, Throwable throwable);
-   
++  public abstract void log(Marker m, String aFqcn, Level level, String message,
++          Throwable throwable);
++
 +  /**
-    * @param level the Uima Level
++   * @param level
++   *          the Uima Level
 +   * @return the Marker to use
 +   */
 +  public static Marker getMarkerForLevel(Level level) {
-     switch(level.toInteger()) {
-     case Level.CONFIG_INT: return UIMA_MARKER_CONFIG;
-     case Level.FINEST_INT: return UIMA_MARKER_FINEST;
-     default: return null;
++    switch (level.toInteger()) {
++      case Level.CONFIG_INT:
++        return UIMA_MARKER_CONFIG;
++      case Level.FINEST_INT:
++        return UIMA_MARKER_FINEST;
++      default:
++        return null;
 +    }
 +  }
 +
 +  /**
 +   * Convert a standard UIMA call for wrapped loggers
 +   * 
-    * @param aFqcn - fully qualified class name of highest level of logging impl.
-    *               The class / method above this in the stack trace is used 
-    *               for identifying where the logging call originated from.
-    * @param level the uima Level
-    * @param message the message
-    * @param thrown may be null              
++   * @param aFqcn
++   *          - fully qualified class name of highest level of logging impl. The class / method
++   *          above this in the stack trace is used for identifying where the logging call
++   *          originated from.
++   * @param level
++   *          the uima Level
++   * @param message
++   *          the message
++   * @param thrown
++   *          may be null
 +   */
 +  @Override
 +  public void log(String aFqcn, Level level, String message, Throwable thrown) {
- //    log(getMarkerForLevel(level), aFqcn, level, message, null, thrown);
++    // log(getMarkerForLevel(level), aFqcn, level, message, null, thrown);
 +    log(getMarkerForLevel(level), aFqcn, level, message, thrown);
 +  }
-   
++
 +  /**
 +   * 
-    * @param level -
++   * @param level
++   *          -
 +   * @return true if not limited
 +   */
 +  private boolean isNotLimited(Level level) {
 +    if (!isLimited) {
 +      return true;
 +    }
-     switch(level.toInteger()) {
-     case Level.SEVERE_INT: if (SEVERE_COUNT >= limit_common) {
-       return false;
-     } SEVERE_COUNT++; return true; 
-     case Level.WARNING_INT: if (WARNING_COUNT >= limit_common) {
-       return false;
-     } WARNING_COUNT++; return true; 
-     case Level.INFO_INT: if (INFO_COUNT >= limit_common) {
-       return false;
-     } INFO_COUNT++; return true; 
-     case Level.CONFIG_INT: if (CONFIG_COUNT >= limit_common) {
-       return false;
-     } CONFIG_COUNT++; return true; 
-     case Level.FINE_INT: if (FINE_COUNT >= limit_common) {
-       return false;
-     } FINE_COUNT++; return true; 
-     case Level.FINER_INT: if (FINER_COUNT >= limit_common) {
-       return false;
-     } FINER_COUNT++; return true; 
-     case Level.FINEST_INT: if (FINEST_COUNT >= limit_common) {
-       return false;
-     } FINEST_COUNT++; return true; 
++    switch (level.toInteger()) {
++      case Level.SEVERE_INT:
++        if (SEVERE_COUNT >= limit_common) {
++          return false;
++        }
++        SEVERE_COUNT++;
++        return true;
++      case Level.WARNING_INT:
++        if (WARNING_COUNT >= limit_common) {
++          return false;
++        }
++        WARNING_COUNT++;
++        return true;
++      case Level.INFO_INT:
++        if (INFO_COUNT >= limit_common) {
++          return false;
++        }
++        INFO_COUNT++;
++        return true;
++      case Level.CONFIG_INT:
++        if (CONFIG_COUNT >= limit_common) {
++          return false;
++        }
++        CONFIG_COUNT++;
++        return true;
++      case Level.FINE_INT:
++        if (FINE_COUNT >= limit_common) {
++          return false;
++        }
++        FINE_COUNT++;
++        return true;
++      case Level.FINER_INT:
++        if (FINER_COUNT >= limit_common) {
++          return false;
++        }
++        FINER_COUNT++;
++        return true;
++      case Level.FINEST_INT:
++        if (FINEST_COUNT >= limit_common) {
++          return false;
++        }
++        FINEST_COUNT++;
++        return true;
 +    }
 +    Misc.internalError();
 +    return false;
 +  }
 +
 +  /**
 +   * @see org.apache.uima.util.Logger#setOutputStream(java.io.OutputStream)
 +   * 
 +   * @deprecated use external configuration possibility
 +   */
 +  @Override
 +  @Deprecated
 +  public void setOutputStream(OutputStream out) {
 +    throw new UnsupportedOperationException();
 +  }
-   
++
 +  /**
 +   * @see org.apache.uima.util.Logger#setOutputStream(java.io.PrintStream)
 +   * 
 +   * @deprecated use external configuration possibility
 +   */
 +  @Override
 +  @Deprecated
 +  public void setOutputStream(PrintStream out) {
 +    throw new UnsupportedOperationException();
 +  }
-   
++
 +  /**
 +   * Logs a message with level INFO.
 +   * 
 +   * @deprecated use new function with log level
 +   * 
 +   * @param aMessage
 +   *          the message to be logged
 +   */
 +  @Override
 +  @Deprecated
 +  public void log(String aMessage) {
 +    if (isLoggable(Level.INFO) && !isEmpty(aMessage) && isNotLimited(Level.INFO)) {
 +      log(fqcnCmn, Level.INFO, aMessage, null);
 +    }
 +  }
 +
 +  /**
 +   * Logs a message with a message key and the level INFO
 +   * 
 +   * @deprecated use new function with log level
 +   * 
 +   * @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
 +   */
 +  @Override
 +  @Deprecated
 +  public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
 +    if (isLoggable(Level.INFO) && !isEmpty(aMessageKey) && isNotLimited(Level.INFO)) {
 +      log(fqcnCmn, Level.INFO, rb(aResourceBundleName, aMessageKey, aArguments), null);
 +    }
 +  }
 +
 +  /**
 +   * Logs an exception with level INFO
 +   * 
 +   * @deprecated use new function with log level
 +   * 
 +   * @param aException
 +   *          the exception to be logged
 +   */
 +  @Override
 +  @Deprecated
 +  public void logException(Exception aException) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO) && aException != null) {
 +      log(fqcnCmn, Level.INFO, EXCEPTION_MESSAGE, aException);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String)
 +   */
 +  @Override
 +  public void log(Level level, String aMessage) {
 +    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 +      log(fqcnCmn, level, aMessage, null);
 +    }
 +  }
-   
++
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.Object)
++   * java.lang.Object)
 +   */
 +  @Override
 +  public void log(Level level, String aMessage, Object param1) {
 +    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 +      log(fqcnCmn, level, MessageFormat.format(aMessage, new Object[] { param1 }), null);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.Object[])
++   * java.lang.Object[])
 +   */
 +  @Override
 +  public void log(Level level, String aMessage, Object[] params) {
 +    if (isLoggable(level) && !isEmpty(aMessage) && isNotLimited(level)) {
 +      log(fqcnCmn, level, MessageFormat.format(aMessage, params), null);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#log(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.Throwable)
++   * java.lang.Throwable)
 +   */
 +  @Override
 +  public void log(Level level, String aMessage, Throwable thrown) {
 +    if (isLoggable(level) && isNotLimited(level)) {
-       log(fqcnCmn, 
-           level,
-           (aMessage != null && !aMessage.equals(""))
-             ? aMessage
-             : EXCEPTION_MESSAGE,
-           thrown);
++      log(fqcnCmn, level, (aMessage != null && !aMessage.equals("")) ? aMessage : EXCEPTION_MESSAGE,
++              thrown);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.String, java.lang.String, java.lang.String, java.lang.Object)
++   * java.lang.String, java.lang.String, java.lang.String, java.lang.Object)
 +   */
 +  @Override
 +  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 +          String msgKey, Object param1) {
 +    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 +      log(fqcnCmn, level, rb(bundleName, msgKey, param1), null);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.String, java.lang.String, java.lang.String, java.lang.Object[])
++   * java.lang.String, java.lang.String, java.lang.String, java.lang.Object[])
 +   */
 +  @Override
 +  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 +          String msgKey, Object[] params) {
 +    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 +      log(fqcnCmn, level, rb(bundleName, msgKey, params), null);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)
++   * java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)
 +   */
 +  @Override
 +  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 +          String msgKey, Throwable thrown) {
 +    if (isLoggable(level) && isNotLimited(level)) {
 +      if (thrown == null && isEmpty(msgKey)) {
 +        return;
 +      }
-       log(fqcnCmn, 
-           level, 
-           (msgKey != null && !msgKey.equals(""))
-             ? rb(bundleName, msgKey)
-             : EXCEPTION_MESSAGE,
-           thrown);
++      log(fqcnCmn, level,
++              (msgKey != null && !msgKey.equals("")) ? rb(bundleName, msgKey) : EXCEPTION_MESSAGE,
++              thrown);
 +    }
 +  }
 +
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#logrb(org.apache.uima.util.Level, java.lang.String,
-    *      java.lang.String, java.lang.String, java.lang.String)
++   * java.lang.String, java.lang.String, java.lang.String)
 +   */
 +  @Override
 +  public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName,
 +          String msgKey) {
 +    if (isLoggable(level) && !isEmpty(msgKey) && isNotLimited(level)) {
 +      log(fqcnCmn, level, rb(bundleName, msgKey), null);
 +    }
 +  }
 +
 +  @Deprecated
 +  @Override
 +  public void setResourceManager(ResourceManager resourceManager) {
 +    mResourceManager = resourceManager;
 +    Misc.decreasingWithTrace(dontSetResourceManagerCount,
 +            "Setting a resouce manager on a logger can lead to memory leaks and to the inability of locating message localizations in multi-classloader scenaros.",
 +            UIMAFramework.getLogger());
 +  }
 +
 +  /**
 +   * Gets the extension ClassLoader to used to locate the message digests. If this returns null,
 +   * then message digests will be searched for using this.class.getClassLoader().
 +   */
 +  private ClassLoader getExtensionClassLoader() {
 +    if (mResourceManager != null) {
 +      return mResourceManager.getExtensionClassLoader();
 +    }
 +
 +    UimaContext context = UimaContextHolder.getContext();
 +    if (context != null) {
 +      return ((UimaContextAdmin) context).getResourceManager().getExtensionClassLoader();
 +    }
 +
 +    ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 +    if (contextClassLoader != null) {
 +      return contextClassLoader;
 +    }
 +
 +    return null;
 +  }
-  
++
 +  /*
 +   * (non-Javadoc)
 +   * 
 +   * @see org.apache.uima.util.Logger#rb(String, String, Object...)
 +   */
 +  @Override
 +  public String rb(String bundleName, String msgKey, Object... parameters) {
 +    return I18nUtil.localizeMessage(bundleName, msgKey, parameters, getExtensionClassLoader());
 +  }
 +
 +  protected boolean isEmpty(String v) {
 +    return (v == null || v.equals(""));
 +  }
 +
 +  @Override
 +  public boolean isAnnotatorLogger() {
 +    return isAnnotatorLogger;
 +  }
-   
++
 +  public void setAnnotatorLogger(boolean v) {
 +    isAnnotatorLogger = v;
 +  }
-   
++
 +  private Object[] suppliersToArray(Supplier<?>[] suppliers) {
 +    Object[] r = new Object[suppliers.length];
 +    int i = 0;
 +    for (Supplier<?> s : suppliers) {
 +      r[i++] = s.get();
 +    }
 +    return r;
 +  }
-   
++
 +  /************************************************
 +   * Convert standard call varieties
 +   ************************************************/
-   
++
 +  @Override
 +  public void debug(String arg0) {
 +    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, arg0, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(String arg0, Object arg1) {
-     if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) { 
-       log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1}, null);
++    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
++      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] { arg1 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(String arg0, Object... arg1) {
-     if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) { 
++    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, arg0, arg1, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(String arg0, Throwable arg1) {
-     if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) { 
++    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, arg0, null, arg1);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(Marker arg0, String arg1) {
 +    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 +      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(String arg0, Object arg1, Object arg2) {
 +    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
-       log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1, arg2}, null);
++      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] { arg1, arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(Marker arg0, String arg1, Object arg2) {
 +    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
-       log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2}, null);
++      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] { arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(Marker arg0, String arg1, Object... arg2) {
 +    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 +      log2(arg0, fqcnCmn, Level.DEBUG, arg1, arg2, null);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(Marker arg0, String arg1, Throwable arg2) {
 +    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
 +      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, arg2);
 +    }
 +  }
 +
 +  @Override
 +  public void debug(Marker arg0, String arg1, Object arg2, Object arg3) {
 +    if (isLoggable(Level.DEBUG, arg0) && isNotLimited(Level.DEBUG)) {
-       log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2, arg3}, null);
++      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] { arg2, arg3 }, null);
 +    }
 +  }
 +
 +  // methods from log4j 2 using Java 8 suppliers
 +
 +  /**
-    * @param msgSupplier A function, which when called, produces the desired log message
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void debug(Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
-     }   
++    }
 +  }
-  
++
 +  /**
-    * @param msgSupplier A function, which when called, produces the desired log message
-    * @param throwable the exception to log
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
++   * @param throwable
++   *          the exception to log
 +   */
 +  @Override
 +  public void debug(Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
-     }   
++    }
 +  }
 +
 +  /**
-    * @param marker the marker data specific to this log statement
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param marker
++   *          the marker data specific to this log statement
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void debug(Marker marker, String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
 +      log2(marker, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
-   
++
 +  /**
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void debug(String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.DEBUG) && isNotLimited(Level.DEBUG)) {
 +      log2(null, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
-     }  
-   }
- 
-   
-  /**
-   * @param marker the marker data specific to this log statement
-   * @param msgSupplier A function, which when called, produces the desired log message
-   */
-  @Override
- public void debug(Marker marker, Supplier<String> msgSupplier) {
-    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
-      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
-    }   
-  }
-  
-  /**
-   * @param marker the marker data specific to this log statement
-   * @param msgSupplier A function, which when called, produces the desired log message
-   */
-  @Override
- public void debug(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
-    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
-      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
-    }   
-  }
-       
-   // ---------------------- ERROR    
-            
++    }
++  }
++
++  /**
++   * @param marker
++   *          the marker data specific to this log statement
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
++   */
++  @Override
++  public void debug(Marker marker, Supplier<String> msgSupplier) {
++    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
++      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
++    }
++  }
++
++  /**
++   * @param marker
++   *          the marker data specific to this log statement
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
++   */
++  @Override
++  public void debug(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
++    if (isLoggable(Level.DEBUG, marker) && isNotLimited(Level.DEBUG)) {
++      log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
++    }
++  }
++
++  // ---------------------- ERROR
++
 +  @Override
 +  public void error(String arg0) {
 +    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, arg0, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(String arg0, Object arg1) {
-     if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) { 
-       log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1}, null);
++    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
++      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] { arg1 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(String arg0, Object... arg1) {
-     if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) { 
++    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, arg0, arg1, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(String arg0, Throwable arg1) {
-     if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) { 
++    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, arg0, null, arg1);
 +    }
 +  }
 +
 +  @Override
 +  public void error(Marker arg0, String arg1) {
 +    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 +      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(String arg0, Object arg1, Object arg2) {
 +    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
-       log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1, arg2}, null);
++      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] { arg1, arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(Marker arg0, String arg1, Object arg2) {
 +    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
-       log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2}, null);
++      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] { arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(Marker arg0, String arg1, Object... arg2) {
 +    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 +      log2(arg0, fqcnCmn, Level.ERROR, arg1, arg2, null);
 +    }
 +  }
 +
 +  @Override
 +  public void error(Marker arg0, String arg1, Throwable arg2) {
 +    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
 +      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, arg2);
 +    }
 +  }
 +
 +  @Override
 +  public void error(Marker arg0, String arg1, Object arg2, Object arg3) {
 +    if (isLoggable(Level.ERROR, arg0) && isNotLimited(Level.ERROR)) {
-       log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2, arg3}, null);
++      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] { arg2, arg3 }, null);
 +    }
 +  }
 +
 +  // methods from log4j 2 using Java 8 suppliers
 +
 +  /**
-    * @param msgSupplier A function, which when called, produces the desired log message
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void error(Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
-     }   
++    }
 +  }
-  
++
 +  /**
-    * @param msgSupplier A function, which when called, produces the desired log message
-    * @param throwable the exception to log
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
++   * @param throwable
++   *          the exception to log
 +   */
 +  @Override
 +  public void error(Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
-     }   
++    }
 +  }
 +
 +  /**
-    * @param marker the marker data specific to this log statement
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param marker
++   *          the marker data specific to this log statement
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void error(Marker marker, String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 +      log2(marker, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
-   
++
 +  /**
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void error(String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.ERROR) && isNotLimited(Level.ERROR)) {
 +      log2(null, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
 +
-   
-  /**
-   * @param marker the marker data specific to this log statement
-   * @param msgSupplier A function, which when called, produces the desired log message
-   */
++  /**
++   * @param marker
++   *          the marker data specific to this log statement
++   * @param msgSupplier
++   *          A function, which when called, produces the desired log message
++   */
 +  @Override
 +  public void error(Marker marker, Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 +      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void error(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.ERROR, marker) && isNotLimited(Level.ERROR)) {
 +      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  // ---------------------- INFO
 +
 +  @Override
 +  public void info(String arg0) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, arg0, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(String arg0, Object arg1) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(String arg0, Object... arg1) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, arg0, arg1, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(String arg0, Throwable arg1) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, arg0, null, arg1);
 +    }
 +  }
 +
 +  @Override
 +  public void info(Marker arg0, String arg1) {
 +    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 +      log2(arg0, fqcnCmn, Level.INFO, arg1, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(String arg0, Object arg1, Object arg2) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1, arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(Marker arg0, String arg1, Object arg2) {
 +    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 +      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(Marker arg0, String arg1, Object... arg2) {
 +    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 +      log2(arg0, fqcnCmn, Level.INFO, arg1, arg2, null);
 +    }
 +  }
 +
 +  @Override
 +  public void info(Marker arg0, String arg1, Throwable arg2) {
 +    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 +      log2(arg0, fqcnCmn, Level.INFO, arg1, null, arg2);
 +    }
 +  }
 +
 +  @Override
 +  public void info(Marker arg0, String arg1, Object arg2, Object arg3) {
 +    if (isLoggable(Level.INFO, arg0) && isNotLimited(Level.INFO)) {
 +      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2, arg3 }, null);
 +    }
 +  }
 +
 +  // methods from log4j 2 using Java 8 suppliers
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void info(Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   * @param throwable
 +   *          the exception to log
 +   */
 +  @Override
 +  public void info(Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param message
 +   *          the message to log
 +   * @param paramSuppliers
-    *          An array of functions, which when called, produce the desired log
-    *          message parameters.
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void info(Marker marker, String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 +      log2(marker, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
 +    }
 +  }
 +
 +  /**
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  public void info(String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.INFO) && isNotLimited(Level.INFO)) {
 +      log2(null, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void info(Marker marker, Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 +      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void info(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.INFO, marker) && isNotLimited(Level.INFO)) {
 +      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  // ---------------------- TRACE
 +
 +  @Override
 +  public void trace(String arg0) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, arg0, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(String arg0, Object arg1) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(String arg0, Object... arg1) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, arg0, arg1, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(String arg0, Throwable arg1) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, arg0, null, arg1);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(Marker arg0, String arg1) {
 +    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 +      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(String arg0, Object arg1, Object arg2) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1, arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(Marker arg0, String arg1, Object arg2) {
 +    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 +      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(Marker arg0, String arg1, Object... arg2) {
 +    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 +      log2(arg0, fqcnCmn, Level.TRACE, arg1, arg2, null);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(Marker arg0, String arg1, Throwable arg2) {
 +    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 +      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, arg2);
 +    }
 +  }
 +
 +  @Override
 +  public void trace(Marker arg0, String arg1, Object arg2, Object arg3) {
 +    if (isLoggable(Level.TRACE, arg0) && isNotLimited(Level.TRACE)) {
 +      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2, arg3 }, null);
 +    }
 +  }
 +
 +  // methods from log4j 2 using Java 8 suppliers
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void trace(Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   * @param throwable
 +   *          the exception to log
 +   */
 +  @Override
 +  public void trace(Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param message
 +   *          the message to log
 +   * @param paramSuppliers
-    *          An array of functions, which when called, produce the desired log
-    *          message parameters.
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void trace(Marker marker, String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 +      log2(marker, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
 +    }
 +  }
 +
 +  /**
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void trace(String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.TRACE) && isNotLimited(Level.TRACE)) {
 +      log2(null, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void trace(Marker marker, Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 +      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void trace(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.TRACE, marker) && isNotLimited(Level.TRACE)) {
 +      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  // ---------------------- WARN
 +  @Override
 +  public void warn(String arg0) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, arg0, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(String arg0, Object arg1) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(String arg0, Object... arg1) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, arg0, arg1, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(String arg0, Throwable arg1) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, arg0, null, arg1);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(Marker arg0, String arg1) {
 +    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 +      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(String arg0, Object arg1, Object arg2) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1, arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(Marker arg0, String arg1, Object arg2) {
 +    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 +      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(Marker arg0, String arg1, Object... arg2) {
 +    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 +      log2(arg0, fqcnCmn, Level.WARNING, arg1, arg2, null);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(Marker arg0, String arg1, Throwable arg2) {
 +    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 +      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, arg2);
 +    }
 +  }
 +
 +  @Override
 +  public void warn(Marker arg0, String arg1, Object arg2, Object arg3) {
 +    if (isLoggable(Level.WARNING, arg0) && isNotLimited(Level.WARNING)) {
 +      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2, arg3 }, null);
 +    }
 +  }
 +
 +  // methods from log4j 2 using Java 8 suppliers
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void warn(Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   * @param throwable
 +   *          the exception to log
 +   */
 +  @Override
 +  public void warn(Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.WARNING) && isNotLimited(Level.WARNING)) {
 +      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param message
 +   *          the message to log
 +   * @param paramSuppliers
-    *          An array of functions, which when called, produce the desired log
-    *          message parameters.
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void warn(Marker marker, String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 +      log2(marker, fqcnCmn, Level.WARNING, message, suppliersToArray(paramSuppliers), null);
 +    }
 +  }
 +
 +  /**
-    * @param message the message to log
-    * @param paramSuppliers An array of functions, which when called, produce the desired log message parameters.
++   * @param message
++   *          the message to log
++   * @param paramSuppliers
++   *          An array of functions, which when called, produce the desired log message parameters.
 +   */
 +  @Override
 +  public void warn(String message, Supplier<?>... paramSuppliers) {
 +    if (isLoggable(Level.WARN) && isNotLimited(Level.WARN)) {
 +      log2(null, fqcnCmn, Level.WARN, message, suppliersToArray(paramSuppliers), null);
-     }  
++    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void warn(Marker marker, Supplier<String> msgSupplier) {
 +    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 +      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
 +    }
 +  }
 +
 +  /**
 +   * @param marker
 +   *          the marker data specific to this log statement
 +   * @param msgSupplier
 +   *          A function, which when called, produces the desired log message
 +   */
 +  @Override
 +  public void warn(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
 +    if (isLoggable(Level.WARNING, marker) && isNotLimited(Level.WARNING)) {
 +      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
 +    }
 +  }
-  
++
 +}