[uimaj] branch master updated (326ad69 -> 27d333d)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Mar 20 22:13:08 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository uimaj.

      from  326ad69   debian/watch: Updated to detect the latest release
      adds  daf695c   Imported Upstream version 2.4.1
       new  2c3a1ab   Merge tag 'upstream/2.4.1'
       new  3a345de   Refreshed the patches Removed java7-compat.diff (fixed upstream)
       new  e6ac56f   debian/rules: Fixed the clean target when used after an incomplete build
       new  27d333d   Added jcasgen-maven-plugin to libuima-tools-java

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 DEPENDENCIES                                       |    34 +-
 PearPackagingMavenPlugin/pom.xml                   |    29 +-
 .../apache/uima/pear/tools/PearPackagingMojo.java  |   131 +-
 README                                             |    90 +-
 RELEASE_NOTES.html                                 |     4 +-
 aggregate-uimaj-docbooks/pom.xml                   |    36 +-
 .../src/main/resources/d/index.html                |    87 +
 aggregate-uimaj-eclipse-plugins/pom.xml            |    14 +-
 aggregate-uimaj/pom.xml                            |    13 +-
 debian/changelog                                   |     7 +-
 debian/control                                     |     1 +
 debian/libuima-core-java.poms                      |     1 +
 debian/maven.ignoreRules                           |     1 +
 debian/patches/build-helper-version.diff           |     4 +-
 debian/patches/disable-integration-tests.diff      |    44 +
 debian/patches/disable_internal_javadoc.diff       |     2 +-
 debian/patches/maven-plugin-configuration.diff     |    32 +
 debian/patches/maven2-compatibility.diff           |    25 +
 debian/patches/modules.diff                        |    12 +-
 debian/patches/series                              |     4 +-
 debian/rules                                       |     2 +-
 issuesFixed/jira-report.html                       |     8 +-
 jVinci/pom.xml                                     |    10 +-
 .../vinci/transport/document/XMLToXTalk.java       |     8 +-
 jcasgen-maven-plugin/pom.xml                       |   140 +
 jcasgen-maven-plugin/src/it/classpath/pom.xml      |    61 +
 .../it/classpath/src/main/java/UseTypeSystem.java  |    25 +-
 .../it/classpath/src/main/resources/TypeSystem.xml |    29 +
 .../src/main/resources/type/Dependency.xml         |    52 +
 .../classpath/src/main/resources/type/Sentence.xml |    32 +
 .../it/classpath/src/main/resources/type/Token.xml |    39 +
 .../src/it/m2e/META-INF/MANIFEST.MF                |    12 +
 .../src/it/m2e/build.properties                    |    11 +-
 jcasgen-maven-plugin/src/it/m2e/pom.xml            |   172 +
 .../src/it/m2e/projects/jcasgen/classpath/pom.xml  |    53 +
 .../classpath/src/main/resources/TypeSystem.xml    |    29 +
 .../src/main/resources/type/Dependency.xml         |    52 +
 .../classpath/src/main/resources/type/Sentence.xml |    32 +
 .../classpath/src/main/resources/type/Token.xml    |    39 +
 .../src/it/m2e/projects/jcasgen/crossref1/pom.xml  |    53 +
 .../crossref1/src/main/resources/type/Token.xml    |    39 +
 .../src/it/m2e/projects/jcasgen/crossref2/pom.xml  |    58 +
 .../crossref2/src/main/resources/TypeSystem.xml    |    52 +
 .../src/it/m2e/projects/jcasgen/simple/pom.xml     |    53 +
 .../simple/src/main/resources/TypeSystem.xml       |    66 +
 .../src/it/m2e/settings-template.xml               |    56 +
 .../uima/tools/jcasgen/maven/JCasGenM2ETest.java   |   203 +
 .../src/it/multimodule/crossref1/pom.xml           |    61 +
 .../crossref1/src/main/java/UseTypeSystem.java     |    23 +-
 .../crossref1/src/main/resources/type/Token.xml    |    39 +
 .../src/it/multimodule/crossref2/pom.xml           |    66 +
 .../crossref2/src/main/java/UseTypeSystem.java     |    24 +-
 .../crossref2/src/main/resources/TypeSystem.xml    |    52 +
 jcasgen-maven-plugin/src/it/multimodule/pom.xml    |    38 +
 jcasgen-maven-plugin/src/it/settings.xml           |    53 +
 jcasgen-maven-plugin/src/it/simple/pom.xml         |    61 +
 .../src/it/simple/src/main/java/UseTypeSystem.java |    25 +-
 .../it/simple/src/main/resources/TypeSystem.xml    |    66 +
 .../uima/tools/jcasgen/maven/JCasGenMojo.java      |   340 +
 .../META-INF/m2e/lifecycle-mapping-metadata.xml    |    35 +
 .../uima/tools/jcasgen/maven/JCasGenMojoTest.java  |   119 +
 .../src/test/resources/classpath/pom.xml           |    45 +
 .../classpath/src/main/resources/TypeSystem.xml    |    57 +
 .../classpath/src/main/resources/type/Token.xml    |    39 +
 .../src/test/resources/exclude/pom.xml             |    48 +
 .../exclude/src/main/resources/type/Sentence.xml   |    32 +
 .../exclude/src/main/resources/type/Token.xml      |    39 +
 .../src/test/resources/simple/pom.xml              |    45 +
 .../src/test/resources/simple/type/TypeSystem.xml  |    66 +
 .../src/test/resources/wildcard/pom.xml            |    45 +
 .../wildcard/src/main/resources/type/Sentence.xml  |    32 +
 .../wildcard/src/main/resources/type/Token.xml     |    39 +
 pom.xml                                            |    21 +-
 uima-docbook-overview-and-setup/pom.xml            |    10 +-
 .../src/docbook/conceptual_overview.xml            |    33 +-
 .../src/docbook/eclipse_setup.xml                  |     9 +-
 .../src/docbook/faqs.xml                           |     2 +-
 .../src/docbook/project_overview.xml               |    35 +-
 uima-docbook-references/pom.xml                    |    10 +-
 uima-docbook-references/src/docbook/ref.cas.xml    |    38 +
 .../src/docbook/ref.compress.xml                   |   198 +
 .../src/docbook/ref.javadocs.xml                   |     2 +
 uima-docbook-references/src/docbook/ref.jcas.xml   |    14 +
 uima-docbook-references/src/docbook/ref.pear.xml   |     6 +
 uima-docbook-references/src/docbook/ref.xmi.xml    |     2 +
 .../src/docbook/ref.xml.component_descriptor.xml   |  2241 +-
 .../src/docbook/ref.xml.cpe_descriptor.xml         |    13 +-
 uima-docbook-references/src/docbook/references.xml |     1 +
 uima-docbook-tools/pom.xml                         |    10 +-
 .../docbook/images/tools/tools.cde/image014v2.jpg  |   Bin 0 -> 81686 bytes
 .../docbook/images/tools/tools.cde/image020.jpg    |   Bin 29356 -> 68784 bytes
 .../docbook/images/tools/tools.cde/image022.jpg    |   Bin 32354 -> 82533 bytes
 .../docbook/images/tools/tools.cde/image025.jpg    |   Bin 0 -> 53377 bytes
 .../images/tools/tools.cde/limitJCasGen.jpg        |   Bin 0 -> 5406 bytes
 .../images/tools/tools.cde/limitJCasGenType.jpg    |   Bin 0 -> 80157 bytes
 .../tools/tools.doc_analyzer/DocAnalyzerScr1.png   |   Bin 0 -> 23434 bytes
 uima-docbook-tools/src/docbook/tools.cde.xml       |   134 +-
 uima-docbook-tools/src/docbook/tools.cpe.xml       |    22 +-
 uima-docbook-tools/src/docbook/tools.cvd.xml       |     2 +-
 .../src/docbook/tools.doc_analyzer.xml             |    22 +-
 uima-docbook-tools/src/docbook/tools.jcasgen.xml   |    73 +-
 .../src/docbook/tools.pear.installer.xml           |     4 +-
 .../src/docbook/tools.pear.packager.xml            |     4 +-
 uima-docbook-tutorials-and-users-guides/pom.xml    |    10 +-
 .../docbook/annotator_analysis_engine_guide.xml    |    78 +-
 .../src/docbook/tug.application.xml                |    31 +-
 .../src/docbook/tug.configuration.xml              |   119 +
 .../src/docbook/tug.cpe.xml                        |    57 +-
 .../src/docbook/tug.fc.xml                         |     4 +-
 .../src/docbook/tug.multi_views.xml                |     7 +-
 .../src/docbook/tug.type_mapping.xml               |   143 +
 .../src/docbook/tug.xmi_emf.xml                    |     4 +-
 .../src/docbook/tutorials_and_users_guides.xml     |     1 +
 uimaj-adapter-soap/pom.xml                         |    10 +-
 uimaj-adapter-vinci/pom.xml                        |    10 +-
 .../vinci/util/UimaSaxVinciFrameBuilder.java       |     2 +-
 uimaj-bootstrap/pom.xml                            |    22 +-
 uimaj-component-test-util/pom.xml                  |    10 +-
 uimaj-core/pom.xml                                 |    25 +-
 .../main/java/org/apache/uima/ResourceFactory.java |     2 +-
 .../org/apache/uima/ResourceSpecifierFactory.java  |     1 -
 .../main/java/org/apache/uima/UIMAFramework.java   |     2 +-
 .../java/org/apache/uima/UIMARuntimeException.java |    25 +-
 .../apache/uima/UIMA_IllegalStateException.java    |     4 +-
 .../uima/UIMA_UnsupportedOperationException.java   |     2 +-
 .../java/org/apache/uima/UimaContextAdmin.java     |    16 +
 .../analysis_component/CasMultiplier_ImplBase.java |     2 +-
 .../uima/analysis_engine/AnalysisEngine.java       |     6 +-
 .../uima/analysis_engine/asb/impl/ASB_impl.java    |     7 +-
 .../impl/AggregateAnalysisEngine_impl.java         |    22 +-
 .../impl/AnalysisEngineDescription_impl.java       |    21 +-
 .../impl/AnalysisEngineManagementImpl.java         |     4 +-
 .../impl/PrimitiveAnalysisEngine_impl.java         |    17 +-
 .../apache/uima/analysis_engine/impl/RsLang.java   |     1 +
 .../apache/uima/analysis_engine/impl/RsLangs.java  |     3 +
 .../analysis_engine/impl/TypeOrFeature_impl.java   |    28 +-
 .../impl/UimacppAnalysisEngineImpl.java            |     7 +-
 .../metadata/AnalysisEngineMetaData.java           |     6 +-
 .../src/main/java/org/apache/uima/cas/CAS.java     |     6 +-
 .../org/apache/uima/cas/CASRuntimeException.java   |     7 +
 .../org/apache/uima/cas/FSIndexRepository.java     |    14 +
 .../main/java/org/apache/uima/cas/FSIterator.java  |     8 +-
 .../src/main/java/org/apache/uima/cas/Marker.java  |     5 +-
 .../SerialFormat.java}                             |    30 +-
 .../org/apache/uima/cas/impl/BinaryCasSerDes4.java |  2726 +
 .../org/apache/uima/cas/impl/BinaryCasSerDes6.java |  3600 +
 .../uima/cas/impl/CASCompleteSerializer.java       |     6 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     |   471 +-
 .../org/apache/uima/cas/impl/CASSerializer.java    |   496 +-
 .../org/apache/uima/cas/impl/CasSeqAddrMaps.java   |   196 +
 .../apache/uima/cas/impl/CasTypeSystemMapper.java  |   336 +
 .../org/apache/uima/cas/impl/CommonAuxHeap.java    |     3 +-
 .../java/org/apache/uima/cas/impl/FSBagIndex.java  |    41 +-
 .../uima/cas/impl/FSIndexComparatorImpl.java       |     6 +-
 .../uima/cas/impl/FSIndexRepositoryImpl.java       |    83 +-
 .../org/apache/uima/cas/impl/FSIntArrayIndex.java  |    68 +-
 .../org/apache/uima/cas/impl/FSRBTSetIndex.java    |     3 +-
 .../org/apache/uima/cas/impl/FSVectorIndex.java    |     6 +-
 .../java/org/apache/uima/cas/impl/MarkerImpl.java  |    20 +
 .../apache/uima/cas/impl/OutOfTypeSystemData.java  |     2 +-
 .../org/apache/uima/cas/impl/Serialization.java    |   199 +-
 .../java/org/apache/uima/cas/impl/SlotKinds.java   |   129 +
 .../java/org/apache/uima/cas/impl/StringHeap.java  |    54 +-
 .../java/org/apache/uima/cas/impl/Subiterator.java |     8 +-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |   202 +-
 .../apache/uima/cas/impl/XmiCasDeserializer.java   |     2 +-
 .../org/apache/uima/cas/impl/XmiCasSerializer.java |    37 +-
 .../uima/cas/impl/XmiSerializationSharedData.java  |     4 +-
 .../org/apache/uima/cas/text/AnnotationIndex.java  |     2 +-
 .../java/org/apache/uima/cas_data/CasData.java     |     2 +-
 .../org/apache/uima/cas_data/FeatureStructure.java |     2 +-
 .../collection/CollectionProcessingEngine.java     |     2 +-
 .../collection/CollectionProcessingManager.java    |     8 +-
 .../apache/uima/collection/CollectionReader.java   |     2 +-
 .../apache/uima/collection/base_cpm/BaseCPM.java   |     6 +-
 .../collection/base_cpm/BaseCollectionReader.java  |     2 +-
 .../uima/collection/base_cpm/SynchPoint.java       |     2 +-
 .../metadata/CasProcessorDeploymentParam.java      |     4 +-
 .../metadata/CasProcessorExecutable.java           |     4 +-
 .../uima/collection/metadata/CpeDescription.java   |     2 +-
 .../java/org/apache/uima/flow/FlowController.java  |     4 +-
 .../apache/uima/flow/FlowControllerContext.java    |     4 +-
 .../apache/uima/impl/ChildUimaContext_impl.java    |     1 +
 .../org/apache/uima/impl/UimaContext_ImplBase.java |    33 +-
 .../apache/uima/internal/util/IntArrayUtils.java   |    10 +-
 .../util/IntKeyValueIterator.java}                 |    22 +-
 .../org/apache/uima/internal/util/IntVector.java   |    36 +-
 .../uima/internal/util/ReplaceStringInFiles.java   |     2 +-
 .../uima/internal/util/SerializationUtils.java     |    10 +-
 .../apache/uima/internal/util/SortedIntSet.java    |     4 +
 .../uima/internal/util/TextStringTokenizer.java    |     2 +-
 .../uima/internal/util/UIMALogFormatter.java       |     7 +-
 .../org/apache/uima/internal/util/XMLUtils.java    |    68 +-
 .../internal/util/rb_trees/CompIntArrayRBT.java    |    74 +-
 .../uima/internal/util/rb_trees/Int2IntRBT.java    |  1234 +
 .../uima/internal/util/rb_trees/IntArrayRBT.java   |   770 +-
 .../uima/internal/util/rb_trees/IntRBTNode.java    |    15 +-
 .../internal/util/rb_trees/IntRedBlackTree.java    |     9 +
 .../src/main/java/org/apache/uima/jcas/JCas.java   |    12 +
 .../org/apache/uima/jcas/cas/AnnotationBase.java   |     6 +-
 .../java/org/apache/uima/jcas/cas/FSArray.java     |    22 +-
 .../java/org/apache/uima/jcas/impl/JCasImpl.java   |    15 +
 .../uima/pear/tools/InstallationController.java    |     2 +-
 .../uima/pear/tools/InstallationProcessor.java     |     2 +-
 .../org/apache/uima/pear/tools/PackageCreator.java |     4 +-
 .../java/org/apache/uima/pear/util/FileUtil.java   |     4 +-
 .../java/org/apache/uima/pear/util/StringUtil.java |     4 +-
 .../java/org/apache/uima/pear/util/UIMAUtil.java   |     6 +-
 .../apache/uima/resource/ConfigurableResource.java |     2 +-
 .../apache/uima/resource/ConfigurationManager.java |     5 +-
 .../org/apache/uima/resource/DataResource.java     |     4 +-
 .../java/org/apache/uima/resource/Resource.java    |    12 +-
 .../resource/ResourceConfigurationException.java   |    17 +-
 .../resource/ResourceInitializationException.java  |    19 +-
 .../org/apache/uima/resource/ResourceManager.java  |     2 +-
 .../apache/uima/resource/ResourceServiceStub.java  |     2 +-
 .../apache/uima/resource/Resource_ImplBase.java    |    31 +-
 .../impl/ConfigurationManagerImplBase.java         |    60 +-
 .../resource/impl/ConfigurationManager_impl.java   |   166 +-
 .../impl/ResourceCreationSpecifier_impl.java       |     3 +-
 .../uima/resource/impl/ResourceManager_impl.java   |    20 +-
 .../uima/resource/impl/ResourceState_impl.java     |     2 +-
 .../apache/uima/resource/metadata/Capability.java  |     2 +-
 .../resource/metadata/ConfigurationParameter.java  |    26 +-
 .../ConfigurationParameterDeclarations.java        |     6 +-
 .../uima/resource/metadata/FeatureDescription.java |     4 +-
 .../resource/metadata/FsIndexKeyDescription.java   |     4 +-
 .../resource/metadata/OperationalProperties.java   |     1 +
 .../metadata/ProcessingResourceMetaData.java       |     4 +-
 .../metadata/ResourceManagerConfiguration.java     |     6 +-
 .../uima/resource/metadata/ResourceMetaData.java   |     8 +-
 .../uima/resource/metadata/SimplePrecondition.java |    10 +-
 .../metadata/impl/ConfigurationParameter_impl.java |    18 +
 .../metadata/impl/FsIndexKeyDescription_impl.java  |    19 +-
 .../uima/resource/metadata/impl/Import_impl.java   |    24 +-
 .../metadata/impl/MetaDataObject_impl.java         |   706 +-
 .../metadata/impl/OperationalProperties_impl.java  |    34 +-
 .../resource/metadata/impl/PropertyXmlInfo.java    |     8 +-
 .../metadata/impl/ResourceMetaData_impl.java       |     4 +-
 .../main/java/org/apache/uima/search/Filter.java   |     2 +-
 .../main/java/org/apache/uima/search/Style.java    |     6 +-
 .../util/AnalysisEnginePerformanceReports.java     |     2 +-
 .../org/apache/uima/util/AnalysisEngineUtils.java  |     2 +-
 .../main/java/org/apache/uima/util/CasCopier.java  |   418 +-
 .../org/apache/uima/util/CasCreationUtils.java     |    88 +-
 .../java/org/apache/uima/util/CasToInlineXml.java  |    39 +-
 .../org/apache/uima/util/InvalidXMLException.java  |     8 +
 .../main/java/org/apache/uima/util/JCasPool.java   |     2 +-
 .../src/main/java/org/apache/uima/util/Level.java  |     2 +-
 .../src/main/java/org/apache/uima/util/Logger.java |    16 +-
 .../main/java/org/apache/uima/util/Progress.java   |     2 +-
 .../main/java/org/apache/uima/util/Settings.java   |    87 +
 .../java/org/apache/uima/util/TCasToInlineXml.java |     7 +-
 .../main/java/org/apache/uima/util/XMLParser.java  |    17 +-
 .../java/org/apache/uima/util/XMLSerializer.java   |   134 +-
 .../java/org/apache/uima/util/impl/DataIO.java     |   496 +
 .../apache/uima/util/impl/JSR47Logger_impl.java    |    52 +-
 .../apache/uima/util/impl/Log4jLogger_impl.java    |    50 +-
 .../org/apache/uima/util/impl/Logger_impl.java     |    10 +
 .../org/apache/uima/util/impl/OptimizeStrings.java |   402 +
 .../uima/util/impl/SaxDeserializer_impl.java       |    26 +-
 .../uima/util/impl/SerializationMeasures.java      |   411 +
 .../org/apache/uima/util/impl/Settings_impl.java   |   288 +
 .../org/apache/uima/util/impl/XMLParser_impl.java  |    24 +-
 .../apache/uima/UIMAException_Messages.properties  |    29 +-
 .../org/apache/uima/impl/factoryConfig.xml         |     3 +-
 .../org/apache/uima/impl/log_messages.properties   |     7 +-
 .../src/main/resources/resourceSpecifierSchema.xsd |    30 +-
 .../impl/AnalysisEngineDescription_implTest.java   |    21 +-
 .../impl/AnalysisEngine_implTest.java              |   181 +-
 .../MultiprocessingAnalysisEngine_implTest.java    |     1 +
 .../uima/analysis_engine/impl/TestAnnotator.java   |     2 +-
 .../uima/analysis_engine/impl/TestAnnotator2.java  |    83 +-
 .../uima/cas/impl/CasTypeSystemMapperTst.java      |   452 +
 .../java/org/apache/uima/cas/impl/SerDesTest4.java |  1101 +
 .../java/org/apache/uima/cas/impl/SerDesTest6.java |  1407 +
 .../uima/cas/impl/XmiCasDeserializerTest.java      |    64 +-
 .../uima/cas/test/AnnotationIteratorTest.java      |    32 +
 .../org/apache/uima/cas/test/CASInitializer.java   |     4 +-
 .../org/apache/uima/cas/test/IteratorTest.java     |   171 +-
 .../org/apache/uima/cas/test/JcasSofaTest.java     |    24 +-
 .../java/org/apache/uima/cas/test/SofaTest.java    |    26 +-
 .../org/apache/uima/cas_data/impl/CasComparer.java |    61 +-
 ...CasComparer.java => CasComparerViewChange.java} |   138 +-
 .../internal/util/rb_trees/Int2IntRBTtest.java     |    91 +
 .../internal/util/rb_trees/IntArrayRBTtest.java    |    71 +
 .../java/org/apache/uima/jcas/test/JCasTest.java   |     6 +-
 .../metadata/impl/MetaDataObject_implTest.java     |     8 +-
 .../uima/testTypeSystem_arrays/OfShorts.java       |   115 +
 .../uima/testTypeSystem_arrays/OfShorts_Type.java  |   116 +
 .../uima/testTypeSystem_arrays/OfStrings.java      |   115 +
 .../uima/testTypeSystem_arrays/OfStrings_Type.java |   116 +
 .../java/org/apache/uima/util/CasCopierTest.java   |    46 +
 .../org/apache/uima/util/CasCreationUtilsTest.java |    31 +-
 .../org/apache/uima/util/CasToInlineXmlTest.java   |    85 +
 .../org/apache/uima/util/TypeSystemUtilTest.java   |    10 +-
 .../org/apache/uima/util/XMLSerializerTest.java    |    63 +
 .../uima/util/impl/JSR47Logger_implTest.java       |    10 +-
 .../apache/uima/util/impl/OptimizeStringsTest.java |   168 +
 .../uima/util/impl/TestLog4jLogger_impl.java       |    60 +-
 .../AggregateTaeWithConfigParamOverrides.xml       |     3 +
 .../CASTests/desc/casTestCaseDescriptor.xml        |    25 +-
 .../CASTests/desc/casTestCaseTypesystem.xml        |    14 +
 .../TypeSystemMergeStringSubtypeBase.xml           |    43 +
 .../TypeSystemMergeStringSubtypeBasePlus.xml       |    48 +
 .../resources/ExampleCas/testIndexes_arrays.xml    |    27 +
 .../resources/ExampleCas/testTypeSystem_arrays.xml |    57 +
 .../src/test/resources/SerDes4/AllKinds.binary     |   Bin 0 -> 1213 bytes
 .../test/resources/SerDes4/ArrayAuxLongs.binary    |   Bin 0 -> 269 bytes
 .../test/resources/SerDes4/ArrayAuxStrings.binary  |   Bin 0 -> 275 bytes
 .../resources/SerDes4/DeltaWithIndexMods.binary    |   Bin 0 -> 1219 bytes
 .../test/resources/SerDes4/DeltaWithMods.binary    |   Bin 0 -> 241 bytes
 .../resources/SerDes4/DeltaWithRefsBelow.binary    |   Bin 0 -> 244 bytes
 .../src/test/resources/SerDes4/SavedInts.binary    | 93773 +++++++++++++++++++
 .../AggregateTaeWithConfigParamOverrides.xml       |     7 +-
 .../AggregateTaeWithConfigParamOverrides2.xml      |     7 +-
 .../AggregateWithExternalOverrides.xml             |    56 +
 .../AggregateWithManyDelegates.xml                 |   143 +
 .../AggregateWithUnknownRemoteComponent.xml        |     9 +-
 .../AnnotatorWithExternalOverrides.xml             |   152 +
 .../InvalidConfigParams14.xml}                     |    32 +-
 ...l => TestPrimitiveOperationalParmsDefaults.xml} |   259 +-
 .../TestPrimitiveTae2.xml                          |   271 +-
 .../testExternalOverride.settings                  |    23 +
 .../testExternalOverride2.settings                 |    23 +
 .../testExternalOverride3.settings                 |    22 +
 uimaj-cpe/checkpoint.dat                           |   Bin 1361 -> 0 bytes
 uimaj-cpe/pom.xml                                  |    10 +-
 .../cpm/container/NetworkCasProcessorImpl.java     |     2 +-
 .../impl/cpm/engine/ArtifactProducer.java          |     9 +-
 .../cpe/CpeResourceManagerConfigurationImpl.java   |     3 +
 .../collection/impl/cpm/cpm_messages.properties    |     4 +
 uimaj-document-annotation/pom.xml                  |    10 +-
 .../apache/uima/jcas/tcas/DocumentAnnotation.java  |     5 +-
 uimaj-eclipse-feature-runtime/feature.properties   |   170 +-
 uimaj-eclipse-feature-runtime/feature.xml          |    32 +-
 uimaj-eclipse-feature-runtime/pom.xml              |    51 +-
 .../src/main/resources/feature.xml                 |    28 +-
 .../uima-eclipse-user-agreement.html               |   127 +
 uimaj-eclipse-feature-tools/feature.properties     |   173 +-
 uimaj-eclipse-feature-tools/feature.xml            |    55 +-
 uimaj-eclipse-feature-tools/pom.xml                |    51 +-
 .../src/main/resources/feature.xml                 |    37 +-
 .../uima-eclipse-user-agreement.html               |   127 +
 uimaj-eclipse-update-site/category.xml             |    34 +
 uimaj-eclipse-update-site/index.html               |    78 -
 .../marker-file-identifying-eclipse-update-site    |     0
 uimaj-eclipse-update-site/pom.xml                  |   244 +-
 uimaj-eclipse-update-site/signEclipseUpdateSite.sh |    47 -
 uimaj-eclipse-update-site/site.xml                 |    79 -
 .../src/main/resources/category.xml                |    34 +
 .../verifySigsEclipseUpdateSite.sh                 |    41 -
 uimaj-eclipse-update-site/web/site.css             |    30 -
 uimaj-eclipse-update-site/web/site.xsl             |   232 -
 uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF       |   122 +-
 uimaj-ep-cas-editor-ide/pom.xml                    |    10 +-
 .../caseditor/ide/DefaultCasDocumentProvider.java  |    33 +-
 .../src/main/resources/META-INF/LICENSE            |   239 +
 .../src/main/resources/META-INF/NOTICE             |    16 +
 uimaj-ep-cas-editor/META-INF/MANIFEST.MF           |   218 +-
 uimaj-ep-cas-editor/pom.xml                        |    10 +-
 .../uima/caseditor/core/model/DefaultColors.java   |     2 +-
 .../uima/caseditor/editor/AbstractDocument.java    |     6 +
 .../uima/caseditor/editor/AnnotationDocument.java  |     7 +
 .../uima/caseditor/editor/AnnotationEditor.java    |    45 +-
 .../uima/caseditor/editor/AnnotationStyle.java     |    16 +-
 .../uima/caseditor/editor/DocumentUimaImpl.java    |    25 +-
 .../apache/uima/caseditor/editor/ICasDocument.java |     7 +-
 .../caseditor/editor/editview/EditViewPage.java    |    92 +-
 .../src/main/resources/META-INF/LICENSE            |   239 +
 .../src/main/resources/META-INF/NOTICE             |    16 +
 uimaj-ep-configurator/META-INF/MANIFEST.MF         |   117 +-
 uimaj-ep-configurator/pom.xml                      |    10 +-
 .../uima/taeconfigurator/PreferencePage.java       |     5 +
 .../taeconfigurator/editors/MultiPageEditor.java   |    46 +-
 .../editors/MultiPageEditorContributor.java        |    22 +
 .../editors/ui/AbstractSection.java                |    18 +-
 .../editors/ui/AbstractSectionParm.java            |    40 +-
 .../editors/ui/AggregateSection.java               |    70 +-
 .../taeconfigurator/editors/ui/FlowSection.java    |     2 +-
 .../editors/ui/ParameterDelegatesSection.java      |    54 +-
 .../editors/ui/ParameterSection.java               |    77 +-
 .../taeconfigurator/editors/ui/TypeSection.java    |    10 +
 .../editors/ui/dialogs/AbstractDialog.java         |     5 +
 .../editors/ui/dialogs/AddParameterDialog.java     |    39 +-
 .../editors/ui/dialogs/AddRemoteServiceDialog.java |   165 +-
 .../files/PickOverrideKeysAndParmName.java         |    83 +-
 .../taeconfigurator/wizards/AbstractNewWizard.java |    59 +-
 .../wizards/CasConsumerNewWizard.java              |    41 +-
 .../wizards/CasInitializerNewWizard.java           |    44 +-
 .../wizards/CollectionReaderNewWizard.java         |    42 +-
 .../wizards/FlowControllerNewWizard.java           |    44 +-
 .../wizards/FsIndexCollectionNewWizard.java        |    27 +-
 .../ResourceManagerConfigurationNewWizard.java     |    28 +-
 .../wizards/TAEConfiguratorNewWizard.java          |    44 +-
 .../wizards/TypePrioritiesNewWizard.java           |    28 +-
 .../wizards/TypeSystemNewWizard.java               |    17 +-
 .../uima/taeconfigurator/messages.properties       |     1 +
 uimaj-ep-debug/META-INF/MANIFEST.MF                |    49 +-
 uimaj-ep-debug/pom.xml                             |    10 +-
 uimaj-ep-jcasgen/META-INF/MANIFEST.MF              |    53 +-
 uimaj-ep-jcasgen/pom.xml                           |    10 +-
 .../org/apache/uima/jcas/jcasgenp/JgPlugin.java    |     1 +
 .../apache/uima/jcas/jcasgenp/JgPluginRunner.java  |     4 +-
 uimaj-ep-launcher/META-INF/MANIFEST.MF             |    61 +-
 uimaj-ep-launcher/pom.xml                          |    10 +-
 uimaj-ep-pear-packager/META-INF/MANIFEST.MF        |    69 +-
 uimaj-ep-pear-packager/pom.xml                     |    10 +-
 uimaj-ep-runtime/META-INF/MANIFEST.MF              |   174 +-
 uimaj-ep-runtime/pom.xml                           |    20 +-
 uimaj-examples/pom.xml                             |    10 +-
 .../casMultiplier/SimpleTextSegmenter.java         |     2 +-
 .../uima/examples/cpe/InlineXmlCasConsumer.java    |     2 +-
 .../uima/examples/cpe/XCasWriterCasConsumer.java   |     2 +-
 .../uima/examples/xmi/XmiEcoreCasConsumer.java     |     2 +-
 .../uima/examples/xmi/XmiWriterCasConsumer.java    |     2 +-
 uimaj-internal-tools/HOWTO                         |    21 -
 uimaj-internal-tools/pom.xml                       |    68 -
 .../uima/internal/tools/LevelIssueAnalyzer.java    |   288 -
 uimaj-parent/pom.xml                               |    15 +-
 uimaj-test-util/pom.xml                            |    10 +-
 uimaj-tools/pom.xml                                |    10 +-
 .../components/FileSystemCollectionReader.java     |     4 +
 .../tools/components/InlineXmlCasConsumer.java     |     2 +-
 .../tools/components/XCasWriterCasConsumer.java    |     2 +-
 .../tools/components/XmiWriterCasConsumer.java     |     2 +-
 .../java/org/apache/uima/tools/cpm/CpmPanel.java   |    41 +-
 .../cvd/AnnotationDisplayCustomizationFrame.java   |    14 +-
 .../java/org/apache/uima/tools/cvd/MainFrame.java  |    11 +-
 .../apache/uima/tools/cvd/tsview/MainFrame.java    |    22 +-
 .../uima/tools/docanalyzer/DocumentAnalyzer.java   |   130 +-
 .../uima/tools/docanalyzer/PrefsMediator.java      |    43 +
 .../java/org/apache/uima/tools/jcasgen/Jg.java     |   112 +-
 .../org/apache/uima/tools/jcasgen/jMergeCtl.xml    |    16 +-
 .../jcasgen/jcasgenpPluginResources.properties     |     1 +
 435 files changed, 121580 insertions(+), 5688 deletions(-)
 create mode 100644 aggregate-uimaj-docbooks/src/main/resources/d/index.html
 create mode 100644 debian/patches/disable-integration-tests.diff
 create mode 100644 debian/patches/maven-plugin-configuration.diff
 create mode 100644 debian/patches/maven2-compatibility.diff
 create mode 100644 jcasgen-maven-plugin/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/classpath/pom.xml
 copy uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java => jcasgen-maven-plugin/src/it/classpath/src/main/java/UseTypeSystem.java (59%)
 create mode 100644 jcasgen-maven-plugin/src/it/classpath/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Dependency.xml
 create mode 100644 jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Sentence.xml
 create mode 100644 jcasgen-maven-plugin/src/it/classpath/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/META-INF/MANIFEST.MF
 copy uimaj-eclipse-feature-runtime/feature.properties => jcasgen-maven-plugin/src/it/m2e/build.properties (75%)
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/classpath/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/classpath/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/classpath/src/main/resources/type/Dependency.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/classpath/src/main/resources/type/Sentence.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/classpath/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/crossref1/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/crossref1/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/crossref2/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/crossref2/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/simple/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/projects/jcasgen/simple/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/settings-template.xml
 create mode 100644 jcasgen-maven-plugin/src/it/m2e/src/org/apache/uima/tools/jcasgen/maven/JCasGenM2ETest.java
 create mode 100644 jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml
 copy uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java => jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/java/UseTypeSystem.java (59%)
 create mode 100644 jcasgen-maven-plugin/src/it/multimodule/crossref1/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml
 copy uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java => jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/java/UseTypeSystem.java (59%)
 create mode 100644 jcasgen-maven-plugin/src/it/multimodule/crossref2/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/it/multimodule/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/it/settings.xml
 create mode 100644 jcasgen-maven-plugin/src/it/simple/pom.xml
 copy uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java => jcasgen-maven-plugin/src/it/simple/src/main/java/UseTypeSystem.java (59%)
 create mode 100644 jcasgen-maven-plugin/src/it/simple/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
 create mode 100644 jcasgen-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
 create mode 100644 jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
 create mode 100644 jcasgen-maven-plugin/src/test/resources/classpath/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/classpath/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/exclude/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/exclude/src/main/resources/type/Sentence.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/exclude/src/main/resources/type/Token.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/simple/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/simple/type/TypeSystem.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/wildcard/pom.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/wildcard/src/main/resources/type/Sentence.xml
 create mode 100644 jcasgen-maven-plugin/src/test/resources/wildcard/src/main/resources/type/Token.xml
 create mode 100644 uima-docbook-references/src/docbook/ref.compress.xml
 create mode 100644 uima-docbook-tools/src/docbook/images/tools/tools.cde/image014v2.jpg
 create mode 100644 uima-docbook-tools/src/docbook/images/tools/tools.cde/image025.jpg
 create mode 100644 uima-docbook-tools/src/docbook/images/tools/tools.cde/limitJCasGen.jpg
 create mode 100644 uima-docbook-tools/src/docbook/images/tools/tools.cde/limitJCasGenType.jpg
 create mode 100644 uima-docbook-tools/src/docbook/images/tools/tools.doc_analyzer/DocAnalyzerScr1.png
 create mode 100644 uima-docbook-tutorials-and-users-guides/src/docbook/tug.configuration.xml
 create mode 100644 uima-docbook-tutorials-and-users-guides/src/docbook/tug.type_mapping.xml
 copy uimaj-core/src/main/java/org/apache/uima/{resource/ResourceServiceStub.java => cas/SerialFormat.java} (59%)
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java
 copy uimaj-core/src/main/java/org/apache/uima/{resource/ResourceServiceStub.java => internal/util/IntKeyValueIterator.java} (59%)
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/Settings.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java
 create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
 copy uimaj-core/src/test/java/org/apache/uima/cas_data/impl/{CasComparer.java => CasComparerViewChange.java} (51%)
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/impl/OptimizeStringsTest.java
 create mode 100644 uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeStringSubtypeBase.xml
 create mode 100644 uimaj-core/src/test/resources/CasCreationUtilsTest/TypeSystemMergeStringSubtypeBasePlus.xml
 create mode 100644 uimaj-core/src/test/resources/ExampleCas/testIndexes_arrays.xml
 create mode 100644 uimaj-core/src/test/resources/ExampleCas/testTypeSystem_arrays.xml
 create mode 100644 uimaj-core/src/test/resources/SerDes4/AllKinds.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/ArrayAuxLongs.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/ArrayAuxStrings.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/DeltaWithIndexMods.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/DeltaWithMods.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/DeltaWithRefsBelow.binary
 create mode 100644 uimaj-core/src/test/resources/SerDes4/SavedInts.binary
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithExternalOverrides.xml
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithExternalOverrides.xml
 copy uimaj-core/src/test/resources/{AnnotatorContextTest/AggregateTaeWithConfigParamOverrides.xml => TextAnalysisEngineImplTest/InvalidConfigParams14.xml} (75%)
 copy uimaj-core/src/test/resources/TextAnalysisEngineImplTest/{TestPrimitiveTae2.xml => TestPrimitiveOperationalParmsDefaults.xml} (92%)
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/testExternalOverride.settings
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/testExternalOverride2.settings
 create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/testExternalOverride3.settings
 delete mode 100644 uimaj-cpe/checkpoint.dat
 create mode 100644 uimaj-eclipse-feature-runtime/uima-eclipse-user-agreement.html
 create mode 100644 uimaj-eclipse-feature-tools/uima-eclipse-user-agreement.html
 create mode 100644 uimaj-eclipse-update-site/category.xml
 delete mode 100644 uimaj-eclipse-update-site/index.html
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-eclipse-update-site/marker-file-identifying-eclipse-update-site (100%)
 delete mode 100644 uimaj-eclipse-update-site/signEclipseUpdateSite.sh
 delete mode 100644 uimaj-eclipse-update-site/site.xml
 create mode 100644 uimaj-eclipse-update-site/src/main/resources/category.xml
 delete mode 100644 uimaj-eclipse-update-site/verifySigsEclipseUpdateSite.sh
 delete mode 100644 uimaj-eclipse-update-site/web/site.css
 delete mode 100644 uimaj-eclipse-update-site/web/site.xsl
 create mode 100644 uimaj-ep-cas-editor-ide/src/main/resources/META-INF/LICENSE
 create mode 100644 uimaj-ep-cas-editor-ide/src/main/resources/META-INF/NOTICE
 create mode 100644 uimaj-ep-cas-editor/src/main/resources/META-INF/LICENSE
 create mode 100644 uimaj-ep-cas-editor/src/main/resources/META-INF/NOTICE
 delete mode 100644 uimaj-internal-tools/HOWTO
 delete mode 100644 uimaj-internal-tools/pom.xml
 delete mode 100644 uimaj-internal-tools/src/main/java/org/apache/uima/internal/tools/LevelIssueAnalyzer.java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git



More information about the pkg-java-commits mailing list