This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository uimaj.
commit 42d799e6abfb5b574872613b8bbdaee2bb280390 Merge: f4ccf37 5c46b5f Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 1 12:46:10 2015 +0200 Merge tag 'upstream/2.7.0' Upstream version 2.7.0 DEPENDENCIES | 44 +- NOTICE | 14 + PearPackagingMavenPlugin/pom.xml | 31 +- README | 82 +- RELEASE_NOTES.html | 214 +- aggregate-uimaj-docbooks/pom.xml | 8 +- aggregate-uimaj-eclipse-plugins/pom.xml | 8 +- aggregate-uimaj/pom.xml | 8 +- issuesFixed/jira-report.html | 416 +++- jVinci/pom.xml | 8 +- jcasgen-maven-plugin/pom.xml | 17 +- .../uima/tools/jcasgen/maven/JCasGenMojo.java | 26 +- pom.xml | 65 +- .../assembly/{bin.xml => bin-without-jackson.xml} | 22 +- src/main/assembly/bin.xml | 46 +- src/main/readme/NOTICE | 21 + src/main/readme/{NOTICE => NOTICE-without-jackson} | 2 +- uima-docbook-overview-and-setup/pom.xml | 8 +- .../src/docbook/project_overview.xml | 4 + uima-docbook-references/pom.xml | 8 +- .../images/references/ref.json/FScollections.png | Bin 0 -> 29024 bytes .../images/references/ref.json/big_picture2.png | Bin 0 -> 34148 bytes .../images/references/ref.json/image_source.odg | Bin 0 -> 26352 bytes .../images/references/ref.json/multi.view.png | Bin 0 -> 13785 bytes .../references/ref.json/two.fs.collections.png | Bin 0 -> 11379 bytes .../images/references/ref.json/types_and_refs.png | Bin 0 -> 10938 bytes uima-docbook-references/src/docbook/ref.cas.xml | 157 +- uima-docbook-references/src/docbook/ref.config.xml | 215 ++ uima-docbook-references/src/docbook/ref.jcas.xml | 15 +- uima-docbook-references/src/docbook/ref.json.xml | 682 ++++++ uima-docbook-references/src/docbook/ref.xmi.xml | 5 + .../src/docbook/ref.xml.component_descriptor.xml | 42 +- uima-docbook-references/src/docbook/references.xml | 2 + uima-docbook-tools/pom.xml | 8 +- uima-docbook-tutorials-and-users-guides/pom.xml | 8 +- .../docbook/annotator_analysis_engine_guide.xml | 17 +- .../src/docbook/tug.application.xml | 42 +- .../src/docbook/tug.multi_views.xml | 24 +- uimaj-adapter-soap/pom.xml | 8 +- uimaj-adapter-vinci/pom.xml | 8 +- uimaj-bootstrap/pom.xml | 8 +- uimaj-component-test-util/pom.xml | 8 +- uimaj-core/pom.xml | 14 +- .../main/java/org/apache/uima/UIMAFramework.java | 2 +- .../java/org/apache/uima/UIMARuntimeException.java | 16 +- .../analysis_component/CasMultiplier_ImplBase.java | 2 +- .../JCasMultiplier_ImplBase.java | 2 +- .../uima/analysis_engine/asb/impl/ASB_impl.java | 7 +- .../analysis_engine/asb/impl/FlowContainer.java | 1 + .../asb/impl/FlowControllerContainer.java | 9 +- .../impl/AggregateAnalysisEngine_impl.java | 11 +- .../impl/AnalysisEngineDescription_impl.java | 36 +- .../impl/AnalysisEngineImplBase.java | 16 +- .../impl/AnalysisEngineManagementImpl.java | 4 + .../impl/AnalysisProcessData_impl.java | 5 + .../impl/AnnotatorContext_impl.java | 1 + .../impl/PearAnalysisEngineWrapper.java | 3 +- .../impl/PrimitiveAnalysisEngine_impl.java | 6 +- .../impl/ResultSpecification_impl.java | 10 +- .../apache/uima/analysis_engine/impl/RsLangs.java | 4 +- .../apache/uima/analysis_engine/impl/RsType.java | 4 +- .../analysis_engine/impl/TypeOrFeature_impl.java | 34 +- .../impl/UimacppAnalysisEngineImpl.java | 7 +- .../AnalysisComponentAdapterFactory.java | 2 +- .../impl/compatibility/AnnotatorAdapter.java | 5 +- .../compatibility/CollectionReaderAdapter.java | 2 +- .../metadata/impl/AnalysisEngineMetaData_impl.java | 14 +- .../metadata/impl/CapabilityLanguageFlow_impl.java | 2 +- .../service/impl/AnalysisEngineService_impl.java | 6 +- .../service/impl/ServiceDataCargo.java | 4 +- .../org/apache/uima/cas/AbstractCas_ImplBase.java | 2 +- .../src/main/java/org/apache/uima/cas/CAS.java | 35 +- .../org/apache/uima/cas/CASRuntimeException.java | 5 +- .../src/main/java/org/apache/uima/cas/FSIndex.java | 58 +- .../org/apache/uima/cas/FSIndexRepository.java | 20 +- .../main/java/org/apache/uima/cas/FSIterator.java | 11 +- .../org/apache/uima/cas/FSMatchConstraint.java | 1 + .../java/org/apache/uima/cas/FeatureValuePath.java | 4 +- .../src/main/java/org/apache/uima/cas/Marker.java | 4 +- .../java/org/apache/uima/cas/ParsingException.java | 2 +- .../src/main/java/org/apache/uima/cas/SofaID.java | 4 +- .../apache/uima/cas/admin/FSIndexComparator.java | 2 +- .../apache/uima/cas/impl/AnnotationBaseImpl.java | 24 +- .../org/apache/uima/cas/impl/AnnotationImpl.java | 7 +- .../uima/cas/impl/AnnotationImplException.java | 2 + .../apache/uima/cas/impl/AnnotationIndexImpl.java | 5 + .../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 63 +- .../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 87 +- .../apache/uima/cas/impl/BooleanConstraint.java | 4 +- .../java/org/apache/uima/cas/impl/CASImpl.java | 1608 ++++++++++---- .../java/org/apache/uima/cas/impl/CASMetadata.java | 2 +- .../org/apache/uima/cas/impl/CASMgrSerializer.java | 13 +- .../org/apache/uima/cas/impl/CASSerializer.java | 8 +- .../org/apache/uima/cas/impl/CasSeqAddrMaps.java | 17 +- .../apache/uima/cas/impl/CasSerializerSupport.java | 1278 +++++++++++ .../apache/uima/cas/impl/CasTypeSystemMapper.java | 8 +- .../apache/uima/cas/impl/CommonAuxArrayFSImpl.java | 13 + .../uima/cas/impl/DebugFSLogicalStructure.java | 27 +- .../apache/uima/cas/impl/DeferredIndexUpdates.java | 73 + .../apache/uima/cas/impl/EmbeddedConstraint.java | 2 +- .../java/org/apache/uima/cas/impl/FSBagIndex.java | 166 +- .../uima/cas/impl/FSBooleanConstraintImpl.java | 2 +- .../org/apache/uima/cas/impl/FSClassRegistry.java | 18 +- .../uima/cas/impl/FSFloatConstraintImpl.java | 10 +- .../uima/cas/impl/FSIndexRepositoryImpl.java | 1418 +++++++++--- .../cas/impl/FSIndexRepositoryImpl.java.svntmp | 1842 ---------------- .../org/apache/uima/cas/impl/FSIntArrayIndex.java | 175 +- .../apache/uima/cas/impl/FSIntConstraintImpl.java | 6 +- .../apache/uima/cas/impl/FSIteratorWrapper.java | 4 +- .../org/apache/uima/cas/impl/FSLeafIndexImpl.java | 90 +- .../java/org/apache/uima/cas/impl/FSRBTIndex.java | 16 +- .../org/apache/uima/cas/impl/FSRBTSetIndex.java | 25 +- .../uima/cas/impl/FSStringConstraintImpl.java | 2 +- .../apache/uima/cas/impl/FSTypeConstraintImpl.java | 4 +- .../org/apache/uima/cas/impl/FSVectorIndex.java | 15 +- .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 276 +++ .../java/org/apache/uima/cas/impl/FeatureImpl.java | 2 +- .../org/apache/uima/cas/impl/FeaturePathImpl.java | 2 +- .../apache/uima/cas/impl/FeatureStructureImpl.java | 20 +- .../uima/cas/impl/FeatureStructureImplC.java | 12 +- .../apache/uima/cas/impl/FeatureValuePathImpl.java | 12 +- .../org/apache/uima/cas/impl/FloatConstraint.java | 4 +- .../org/apache/uima/cas/impl/IntConstraint.java | 4 +- .../uima/cas/impl/LinearTypeOrderBuilderImpl.java | 4 +- .../java/org/apache/uima/cas/impl/ListUtils.java | 850 +++---- .../java/org/apache/uima/cas/impl/LowLevelCAS.java | 11 +- .../apache/uima/cas/impl/LowLevelException.java | 2 + .../uima/cas/impl/LowLevelIteratorAggregate.java | 180 ++ .../apache/uima/cas/impl/LowLevelTypeSystem.java | 4 +- .../apache/uima/cas/impl/OutOfTypeSystemData.java | 4 +- .../org/apache/uima/cas/impl/Serialization.java | 2 +- .../java/org/apache/uima/cas/impl/SofaFSImpl.java | 2 +- .../org/apache/uima/cas/impl/StringConstraint.java | 4 +- .../java/org/apache/uima/cas/impl/StringMap.java | 3 +- .../org/apache/uima/cas/impl/StringTypeImpl.java | 6 +- .../java/org/apache/uima/cas/impl/Subiterator.java | 2 +- .../java/org/apache/uima/cas/impl/TypeImpl.java | 3 + .../org/apache/uima/cas/impl/TypeSystemImpl.java | 227 +- .../uima/cas/impl/UnambiguousIteratorImpl.java | 2 +- .../org/apache/uima/cas/impl/XCASDeserializer.java | 80 +- .../org/apache/uima/cas/impl/XCASSerializer.java | 8 +- .../apache/uima/cas/impl/XmiCasDeserializer.java | 484 ++-- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 2331 +++++++++----------- .../uima/cas/impl/XmiSerializationSharedData.java | 76 +- .../apache/uima/cas_data/impl/CasDataToXCas.java | 6 +- .../uima/cas_data/impl/FeatureStructureImpl.java | 6 +- .../uima/cas_data/impl/PrimitiveArrayFSImpl.java | 2 +- .../uima/cas_data/impl/ReferenceArrayFSImpl.java | 2 +- .../org/apache/uima/collection/CasConsumer.java | 6 +- .../uima/collection/CasConsumer_ImplBase.java | 1 - .../org/apache/uima/collection/CasInitializer.java | 2 +- .../uima/collection/CasInitializerDescription.java | 2 +- .../uima/collection/CasInitializer_ImplBase.java | 3 +- .../apache/uima/collection/CollectionReader.java | 3 + .../uima/collection/CollectionReader_ImplBase.java | 1 - .../apache/uima/collection/base_cpm/BaseCPM.java | 3 - .../base_cpm/CasDataCollectionReader_ImplBase.java | 1 - .../uima/collection/base_cpm/CasDataConsumer.java | 5 +- .../base_cpm/CasDataConsumer_ImplBase.java | 1 - .../collection/base_cpm/CasDataInitializer.java | 2 +- .../base_cpm/CasDataInitializer_ImplBase.java | 4 +- .../uima/collection/metadata/CpeCasProcessor.java | 2 +- .../uima/collection/metadata/CpeDescription.java | 10 +- .../collection/metadata/CpeLocalCasProcessor.java | 2 + .../uima/collection/metadata/CpeSofaMapping.java | 4 +- .../uima/collection/metadata/OutputQueue.java | 2 +- .../uima/examples/SourceDocumentInformation.java | 22 +- .../examples/SourceDocumentInformation_Type.java | 54 +- .../flow/impl/AnalysisSequenceCapabilityNode.java | 1 + .../impl/CapabilityLanguageFlowController.java | 4 +- .../flow/impl/CapabilityLanguageFlowObject.java | 5 +- .../apache/uima/flow/impl/FixedFlowController.java | 26 +- .../uima/flow/impl/FlowControllerContext_impl.java | 8 +- .../apache/uima/impl/ChildUimaContext_impl.java | 2 +- .../org/apache/uima/impl/RootUimaContext_impl.java | 2 - .../org/apache/uima/impl/UIMAFramework_impl.java | 4 + .../org/apache/uima/impl/UimaContext_ImplBase.java | 14 +- .../src/main/java/org/apache/uima/impl/Util.java | 20 +- .../uima/internal/util/AnalysisEnginePool.java | 6 + .../org/apache/uima/internal/util/BrowserUtil.java | 4 +- .../uima/internal/util/CharArraySpanMap.java | 8 +- .../apache/uima/internal/util/CharArrayString.java | 6 +- .../apache/uima/internal/util/CharacterUtils.java | 2 +- .../uima/internal/util/CommandLineParser.java | 4 +- .../org/apache/uima/internal/util/GraphNode.java | 4 +- .../util/InstrumentationFacility_impl.java | 1 + .../apache/uima/internal/util/Int2IntHashMap.java | 510 +++++ .../org/apache/uima/internal/util/IntBitSet.java | 318 +++ .../org/apache/uima/internal/util/IntHashSet.java | 849 +++++++ .../java/org/apache/uima/internal/util/IntSet.java | 191 +- .../org/apache/uima/internal/util/IntStack.java | 7 +- .../org/apache/uima/internal/util/IntVector.java | 132 +- .../apache/uima/internal/util/JmxMBeanAgent.java | 4 +- .../apache/uima/internal/util/PositiveIntSet.java | 113 + .../uima/internal/util/PositiveIntSet_impl.java | 749 +++++++ .../uima/internal/util/ReplaceStringInFiles.java | 12 +- .../apache/uima/internal/util/ResourcePool.java | 4 +- .../apache/uima/internal/util/SortedIntSet.java | 6 +- .../apache/uima/internal/util/StringToIntMap.java | 4 +- .../org/apache/uima/internal/util/StringUtils.java | 3 +- .../org/apache/uima/internal/util/SymbolTable.java | 8 +- .../uima/internal/util/TextStringTokenizer.java | 2 +- .../apache/uima/internal/util/TextTokenizer.java | 19 +- .../org/apache/uima/internal/util/TimeSpan.java | 26 +- .../apache/uima/internal/util/UIMAClassLoader.java | 9 +- .../uima/internal/util/UIMALogFormatter.java | 3 +- .../org/apache/uima/internal/util/UtilError.java | 2 + .../org/apache/uima/internal/util/XMLUtils.java | 4 - .../apache/uima/internal/util/XmlElementName.java | 6 +- .../internal/util/rb_trees/CompIntArrayRBT.java | 5 +- .../uima/internal/util/rb_trees/Int2IntRBT.java | 31 +- .../uima/internal/util/rb_trees/IntArrayRBT.java | 17 +- .../internal/util/rb_trees/IntArrayRBTcommon.java | 25 +- .../uima/internal/util/rb_trees/IntRBTArray.java | 1 + .../uima/internal/util/rb_trees/IntRBTNode.java | 4 +- .../internal/util/rb_trees/IntRedBlackTree.java | 3 + .../internal/util/rb_trees/RBTKeyValuePair.java | 2 + .../uima/internal/util/rb_trees/RBTNode.java | 3 +- .../uima/internal/util/rb_trees/RedBlackTree.java | 17 +- .../src/main/java/org/apache/uima/jcas/JCas.java | 30 +- .../main/java/org/apache/uima/jcas/cas/Sofa.java | 4 + .../java/org/apache/uima/jcas/cas/Sofa_Type.java | 2 + .../main/java/org/apache/uima/jcas/cas/TOP.java | 6 +- .../org/apache/uima/jcas/impl/JCasHashMap.java | 359 +-- .../apache/uima/jcas/impl/JCasHashMapSubMap.java | 418 ++++ .../java/org/apache/uima/jcas/impl/JCasImpl.java | 153 +- .../uima/pear/tools/InstallationController.java | 12 +- .../uima/pear/tools/InstallationDescriptor.java | 12 +- .../pear/tools/InstallationDescriptorHandler.java | 4 +- .../uima/pear/tools/InstallationProcessor.java | 10 +- .../uima/pear/tools/LocalInstallationAgent.java | 4 +- .../java/org/apache/uima/pear/util/FileUtil.java | 2 +- .../org/apache/uima/pear/util/ProcessUtil.java | 2 +- .../java/org/apache/uima/pear/util/StringUtil.java | 2 +- .../java/org/apache/uima/pear/util/UIMAUtil.java | 4 +- .../java/org/apache/uima/pear/util/XMLUtil.java | 2 +- .../apache/uima/resource/impl/CasManager_impl.java | 7 +- .../impl/ConfigurationManagerImplBase.java | 15 +- .../resource/impl/RelativePathResolver_impl.java | 4 +- .../uima/resource/impl/ResourceManager_impl.java | 14 +- .../uima/resource/impl/ResourceState_impl.java | 1 - .../resource/metadata/impl/Capability_impl.java | 2 +- .../ConfigurationParameterDeclarations_impl.java | 10 +- .../impl/ConfigurationParameterSettings_impl.java | 22 +- .../metadata/impl/ConfigurationParameter_impl.java | 4 +- .../metadata/impl/FsIndexCollection_impl.java | 2 +- .../metadata/impl/FsIndexKeyDescription_impl.java | 25 +- .../uima/resource/metadata/impl/Import_impl.java | 26 +- .../impl/MetaDataObjectSerializer_indent.java | 452 ++++ .../impl/MetaDataObjectSerializer_plain.java | 135 ++ .../metadata/impl/MetaDataObject_impl.java | 1100 ++++----- .../metadata/impl/MimeTypePrecondition_impl.java | 4 +- .../impl/ResourceManagerConfiguration_impl.java | 11 +- .../metadata/impl/ResourceMetaData_impl.java | 3 +- .../metadata/impl/TypeDescription_impl.java | 1 + .../metadata/impl/TypePriorities_impl.java | 23 +- .../metadata/impl/TypeSystemDescription_impl.java | 2 +- .../service/impl/ResourceService_impl.java | 4 +- .../org/apache/uima/search/impl/Filter_impl.java | 4 +- .../uima/uimacpp/UimacppAnalysisComponent.java | 3 +- .../org/apache/uima/uimacpp/UimacppEngine.java | 2 + .../org/apache/uima/uimacpp/UimacppException.java | 1 + .../main/java/org/apache/uima/util/CasCopier.java | 781 ++++--- .../org/apache/uima/util/CasCreationUtils.java | 29 +- .../main/java/org/apache/uima/util/CasPool.java | 2 +- .../java/org/apache/uima/util/CasToInlineXml.java | 7 +- .../main/java/org/apache/uima/util/JCasPool.java | 2 +- .../src/main/java/org/apache/uima/util/Level.java | 5 +- .../java/org/apache/uima/util/MessageReport.java | 56 + .../src/main/java/org/apache/uima/util/Misc.java | 46 + .../java/org/apache/uima/util/ProgressImpl.java | 2 +- .../java/org/apache/uima/util/TCasToInlineXml.java | 8 +- .../java/org/apache/uima/util/XMLSerializer.java | 26 + .../main/java/org/apache/uima/util/XMLizable.java | 3 +- .../java/org/apache/uima/util/impl/DataIO.java | 1 - .../apache/uima/util/impl/JSR47Logger_impl.java | 7 +- .../apache/uima/util/impl/Log4jLogger_impl.java | 4 +- .../org/apache/uima/util/impl/OptimizeStrings.java | 9 +- .../uima/util/impl/ProcessTraceEvent_impl.java | 26 +- .../apache/uima/util/impl/ProcessTrace_impl.java | 47 +- .../uima/util/impl/SerializationMeasures.java | 6 +- .../org/apache/uima/util/impl/XMLParser_impl.java | 8 +- .../apache/uima/UIMAException_Messages.properties | 13 +- .../org/apache/uima/impl/UimaVersion.java | 3 + .../impl/AnalysisEngineDescription_implTest.java | 2 - .../impl/AnalysisEngine_implTest.java | 26 +- .../analysis_engine/impl/AnnotationWriter.java | 2 +- .../analysis_engine/impl/MultiViewAnnotator.java | 117 + .../MultiprocessingAnalysisEngine_implTest.java | 4 +- .../analysis_engine/impl/NewlineResegmenter.java | 1 - .../analysis_engine/impl/NewlineSegmenter.java | 2 +- .../uima/analysis_engine/impl/TabSegmenter.java | 2 +- .../java/org/apache/uima/cas/impl/CasPoolTest.java | 2 +- .../uima/cas/impl/CasTypeSystemMapperTst.java | 4 - .../org/apache/uima/cas/impl/FSBagIndexTest.java | 164 ++ .../cas/impl/IndexCorruptionReportingTest.java | 82 + .../java/org/apache/uima/cas/impl/SerDesTest4.java | 13 +- .../java/org/apache/uima/cas/impl/SerDesTest6.java | 120 +- .../apache/uima/cas/impl/XCASDeserializerTest.java | 38 +- .../uima/cas/impl/XmiCasDeserializerTest.java | 245 +- .../uima/cas/test/AnnotationIteratorTest.java | 2 +- .../apache/uima/cas/test/FilteredIteratorTest.java | 10 +- .../apache/uima/cas/test/GrowingTheCasTest.java | 110 + .../apache/uima/cas/test/IndexComparitorTest.java | 145 +- .../apache/uima/cas/test/IndexRepositoryTest.java | 60 +- .../org/apache/uima/cas/test/IteratorTest.java | 527 +++-- .../org/apache/uima/cas/test/JcasSofaTest.java | 17 + .../uima/cas/test/NewPrimitiveTypesTest.java | 8 +- .../java/org/apache/uima/cas/test/Sentence.java | 3 +- .../org/apache/uima/cas/test/Sentence_Type.java | 8 +- .../uima/cas/test/SerializationNoMDTest.java | 4 +- .../uima/cas/test/SerializationReinitTest.java | 15 +- .../java/org/apache/uima/cas/test/SofaTest.java | 21 +- .../org/apache/uima/cas/test/SubiteratorTest.java | 1 - .../test/java/org/apache/uima/cas/test/Token.java | 3 +- .../java/org/apache/uima/cas/test/Token_Type.java | 8 +- .../org/apache/uima/cas/test/TypeSystemTest.java | 7 + .../org/apache/uima/cas_data/impl/CasComparer.java | 7 +- .../cas_data/impl/XCasToCasDataSaxHandlerTest.java | 3 +- .../org/apache/uima/impl/UimaContext_implTest.java | 4 +- ...Int2IntRBTtest.java => Int2IntHashMapTest.java} | 24 +- .../apache/uima/internal/util/Int2IntPerfTest.java | 153 ++ .../apache/uima/internal/util/IntBitSetTest.java | 164 ++ .../uima/internal/util/IntHashSetPerfTest.java | 185 ++ .../apache/uima/internal/util/IntHashSetTest.java | 130 ++ .../uima/internal/util/MultiThreadUtils.java | 2 - .../uima/internal/util/PositiveIntSetTest.java | 403 ++++ .../uima/internal/util/ResourcePoolTest.java | 6 +- .../uima/internal/util/UIMAClassLoaderTest.java | 2 +- .../internal/util/rb_trees/Int2IntRBTtest.java | 31 +- .../internal/util/rb_trees/IntArrayRBTtest.java | 19 +- .../uima/jcas/impl/JCasHashMapCompareTest.java | 12 +- .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 118 +- .../java/org/apache/uima/jcas/test/JCasTest.java | 22 +- .../util/TestPearInstallationVerification.java | 2 +- .../uima/resource/impl/CasManager_implTest.java | 1 - .../uima/resource/impl/PearSpecifier_implTest.java | 4 +- .../resource/metadata/impl/Import_implTest.java | 4 +- .../metadata/impl/MetaDataObject_implTest.java | 4 +- .../uima/testTypeSystem_arrays/OfShorts.java | 5 +- .../uima/testTypeSystem_arrays/OfShorts_Type.java | 12 +- .../uima/testTypeSystem_arrays/OfStrings.java | 5 +- .../uima/testTypeSystem_arrays/OfStrings_Type.java | 12 +- .../java/org/apache/uima/util/CasCopierTest.java | 79 +- .../org/apache/uima/util/CasWrapperForTstng.java | 11 + .../org/apache/uima/util/XMLSerializerTest.java | 18 + .../uima/util/impl/JSR47Logger_implTest.java | 6 + .../org/apache/uima/util/impl/LoggingTest.java | 2 + .../apache/uima/util/impl/OptimizeStringsTest.java | 48 +- .../uima/util/impl/ProcessTrace_implTest.java | 28 +- .../uima/util/impl/TestLog4jLogger_impl.java | 2 +- .../src/test/resources/CASTests/xcas/sample1.xcas | 608 ++--- .../src/test/resources/CASTests/xcas/sample2.xcas | 1216 +++++----- .../test/resources/ExampleCas/testTypeSystem.xml | 1125 +++++----- .../MultiViewAnnotator.xml | 65 + uimaj-cpe/checkpoint.dat | Bin 0 -> 1361 bytes uimaj-cpe/checkpoint.dat.prev | Bin 1274 -> 1368 bytes uimaj-cpe/pom.xml | 8 +- uimaj-document-annotation/pom.xml | 8 +- uimaj-eclipse-feature-runtime/feature.xml | 4 +- uimaj-eclipse-feature-runtime/pom.xml | 8 +- uimaj-eclipse-feature-tools/feature.xml | 18 +- uimaj-eclipse-feature-tools/pom.xml | 8 +- uimaj-eclipse-update-site/pom.xml | 2 +- uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF | 61 +- uimaj-ep-cas-editor-ide/pom.xml | 11 +- uimaj-ep-cas-editor/META-INF/MANIFEST.MF | 61 +- uimaj-ep-cas-editor/pom.xml | 11 +- uimaj-ep-configurator/META-INF/MANIFEST.MF | 28 +- uimaj-ep-configurator/pom.xml | 10 +- uimaj-ep-debug/META-INF/MANIFEST.MF | 10 +- uimaj-ep-debug/pom.xml | 8 +- uimaj-ep-jcasgen/META-INF/MANIFEST.MF | 10 +- uimaj-ep-jcasgen/pom.xml | 8 +- uimaj-ep-launcher/META-INF/MANIFEST.MF | 10 +- uimaj-ep-launcher/pom.xml | 8 +- uimaj-ep-pear-packager/META-INF/MANIFEST.MF | 16 +- uimaj-ep-pear-packager/pom.xml | 8 +- uimaj-ep-runtime/META-INF/MANIFEST.MF | 140 +- uimaj-ep-runtime/pom.xml | 10 +- uimaj-examples/pom.xml | 8 +- .../apache/uima/examples/cas/RegExAnnotator.java | 5 +- .../uima/examples/xmi/Ecore2UimaTypeSystem.java | 4 +- .../UIMA Annotation Viewer.launch | 50 +- .../UIMA CAS Visual Debugger.launch | 36 +- .../src/main/run_configuration/UIMA CPE GUI.launch | 50 +- .../UIMA Document Analyzer.launch | 40 +- .../run_configuration/UIMA JCasGen Merge.launch | 52 +- .../src/main/run_configuration/UIMA JCasGen.launch | 36 +- .../run_configuration/UIMA PEAR Installer.launch | 40 +- .../src/main/run_configuration/UIMA Run AE.launch | 42 +- .../src/main/run_configuration/UIMA Run CPE.launch | 42 +- .../main/run_configuration/UIMA Start VNS.launch | 34 +- .../UIMA Start Vinci Service.launch | 42 +- uimaj-json/pom.xml | 97 + .../org/apache/uima/json/JsonCasSerializer.java | 1375 ++++++++++++ .../apache/uima/json/JsonMetaDataSerializer.java | 158 ++ .../impl/JsonContentHandlerJacksonWrapper.java | 367 +++ .../json/impl/MetaDataObjectSerializer_json.java | 203 ++ .../apache/uima/json/JsonCasSerializerTest.java | 598 +++++ .../apache/uima/json/JsonMetaDataObjectTest.java | 188 ++ .../apache/uima/json/JsonXmiCasSerializerTest.java | 28 +- .../resource/metadata/impl/TestFruitBagObject.java | 74 + .../resource/metadata/impl/TestFruitObject.java | 161 ++ .../test/java/org/apache/uima/test/AllTypes.java | 813 +++++++ .../java/org/apache/uima/test/AllTypes_Type.java | 980 ++++++++ .../test/java/org/apache/uima/test/RefTypes.java | 169 ++ .../java/org/apache/uima/test/RefTypes_Type.java | 176 ++ .../CASTests/desc/casTestCaseTypesystem.xml | 243 ++ .../json/expected/testTypesystem-plain.json | 1 + .../CASTests/json/expected/testTypesystem.json | 23 + .../resources/CasSerialization/desc/allTypes.xml | 170 ++ .../CasSerialization/desc/nameSpaceNeeded.xml | 42 + .../resources/CasSerialization/desc/refTypes.xml | 58 + .../expected/json/allValuesNoOmits.txt | 42 + .../expected/json/allValuesOmits.txt | 42 + .../expected/json/allValuesStaticNoOmits.txt | 31 + .../expected/json/array-a1-not-a.txt | 10 + .../expected/json/array-a1-not-l.txt | 10 + .../expected/json/array-a2-not-a.txt | 10 + .../expected/json/array-a2-not-l.txt | 10 + .../expected/json/array-a3-not-a.txt | 10 + .../expected/json/array-a3-not-l.txt | 10 + .../expected/json/array-all-embeddable-a.txt | 10 + .../expected/json/array-all-embeddable-l.txt | 10 + .../expected/json/array-non-embeddable-a.txt | 10 + .../expected/json/array-non-embeddable-l.txt | 10 + .../json/array-self-items-all-embeddable-a.txt | 12 + .../json/array-self-items-all-embeddable-l.txt | 12 + .../expected/json/array-self-non-embeddable-a.txt | 12 + .../expected/json/array-self-non-embeddable-l.txt | 12 + .../CasSerialization/expected/json/emptyCAS.txt | 1 + .../expected/json/indexedAndRef.txt | 8 + .../expected/json/indexedSingleList.txt | 15 + .../expected/json/indexedSingleListStatic.txt | 19 + .../expected/json/multipleViews.txt | 47 + .../expected/json/nameSpaceCollision.txt | 1 + .../expected/json/nameSpaceCollision2.txt | 1 + .../expected/json/nameSpaceCollision2Omits.txt | 1 + .../expected/json/nameSpaceCollision2pp.txt | 29 + .../expected/json/nameSpaceCollision2ppOmits.txt | 29 + .../expected/json/nameSpaceCollisionOmits.txt | 1 + .../expected/json/nameSpaceCollsionFiltered.txt | 1 + .../expected/json/nameSpaceNoCollsionFiltered.txt | 1 + .../expected/json/topAndTokenOnly.txt | 1 + .../expected/json/topAndTokenOnlyNoContext.txt | 1 + .../json/topAndTokenOnlyNoExpandedTypeNames.txt | 1 + .../expected/json/topAndTokenOnlyNoSubtypes.txt | 1 + .../expected/json/topExpandedNamesNoViews.txt | 1 + .../expected/json/topNoContext.txt | 1 + .../expected/json/topNoExpandedTypeNames.txt | 1 + .../expected/json/topWithDefaultViewOmits.txt | 1 + .../expected/json/topWithNamedViewOmits.txt | 1 + .../expected/json/twoListMerge.txt | 18 + .../expected/json/twoListMergeStatic.txt | 20 + .../expected/xmi/allValuesNoOmits.xml | 16 + .../expected/xmi/allValuesOmits.xml | 16 + .../expected/xmi/allValuesStaticNoOmits.xml | 16 + .../expected/xmi/array-a1-not-a.xml | 9 + .../expected/xmi/array-a1-not-l.xml | 9 + .../expected/xmi/array-a2-not-a.xml | 9 + .../expected/xmi/array-a2-not-l.xml | 9 + .../expected/xmi/array-a3-not-a.xml | 9 + .../expected/xmi/array-a3-not-l.xml | 9 + .../expected/xmi/array-all-embeddable-a.xml | 9 + .../expected/xmi/array-all-embeddable-l.xml | 9 + .../expected/xmi/array-non-embeddable-a.xml | 9 + .../expected/xmi/array-non-embeddable-l.xml | 9 + .../xmi/array-self-items-all-embeddable-a.xml | 10 + .../xmi/array-self-items-all-embeddable-l.xml | 13 + .../expected/xmi/array-self-non-embeddable-a.xml | 10 + .../expected/xmi/array-self-non-embeddable-l.xml | 13 + .../CasSerialization/expected/xmi/emptyCAS.xml | 1 + .../expected/xmi/indexedAndRef.xml | 7 + .../expected/xmi/indexedSingleList.xml | 8 + .../expected/xmi/indexedSingleListStatic.xml | 8 + .../expected/xmi/multipleViews.xml | 28 + .../expected/xmi/nameSpaceCollision.xml | 1 + .../expected/xmi/nameSpaceCollision2.xml | 1 + .../expected/xmi/nameSpaceCollision2Omits.xml | 1 + .../expected/xmi/nameSpaceCollision2pp.xml | 9 + .../expected/xmi/nameSpaceCollision2ppOmits.xml | 9 + .../expected/xmi/nameSpaceCollisionOmits.xml | 1 + .../expected/xmi/nameSpaceCollsionFiltered.xml | 1 + .../expected/xmi/nameSpaceNoCollsionFiltered.xml | 1 + .../expected/xmi/topAndTokenOnly.xml | 1 + .../expected/xmi/topAndTokenOnlyNoContext.xml | 1 + .../xmi/topAndTokenOnlyNoExpandedTypeNames.xml | 1 + .../expected/xmi/topAndTokenOnlyNoSubtypes.xml | 1 + .../expected/xmi/topExpandedNamesNoViews.xml | 1 + .../CasSerialization/expected/xmi/topNoContext.xml | 1 + .../expected/xmi/topNoExpandedTypeNames.xml | 1 + .../expected/xmi/topWithDefaultViewOmits.xml | 1 + .../expected/xmi/topWithNamedViewOmits.xml | 1 + .../CasSerialization/expected/xmi/twoListMerge.xml | 9 + .../expected/xmi/twoListMergeStatic.xml | 9 + uimaj-parent/pom.xml | 71 +- uimaj-test-util/pom.xml | 8 +- .../uima/test/junit_extension/FileCompare.java | 31 +- .../test/junit_extension/ManageOutputDevice.java | 2 +- uimaj-tools/pom.xml | 8 +- .../src/main/java/org/apache/uima/tools/RunAE.java | 2 +- .../tools/docanalyzer/AnnotationViewerDialog.java | 4 +- .../java/org/apache/uima/tools/jcasgen/Jg.java | 40 +- .../uima/tools/util/htmlview/annotationViewer.js | 20 +- 505 files changed, 25771 insertions(+), 10031 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
