[uimaj] 01/03: Merge tag 'upstream/2.5.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 20 23:25:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository uimaj.
commit 6772f97973465aacd7eaae9a29eb18f3a9afda7f
Merge: 130dc38 8fe5650
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Mar 21 00:07:50 2014 +0100
Merge tag 'upstream/2.5.0'
Upstream version 2.5.0
DEPENDENCIES | 40 +-
LICENSE | 2 +-
NOTICE | 8 +-
PearPackagingMavenPlugin/pom.xml | 9 +-
.../apache/uima/pear/tools/PearPackagingMojo.java | 8 +-
README | 6 +-
RELEASE_NOTES.html | 7 +-
aggregate-uimaj-docbooks/pom.xml | 9 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 9 +-
aggregate-uimaj/pom.xml | 9 +-
issuesFixed/jira-report.html | 8 +-
jVinci/pom.xml | 9 +-
.../org/apache/vinci/debug/FatalException.java | 4 +-
.../org/apache/vinci/transport/BaseClient.java | 56 +-
.../org/apache/vinci/transport/BaseServer.java | 12 +-
.../java/org/apache/vinci/transport/Frame.java | 12 +-
.../java/org/apache/vinci/transport/FrameLeaf.java | 2 +-
.../apache/vinci/transport/LeafCastException.java | 4 +-
.../vinci/transport/ServiceDownException.java | 4 +-
.../org/apache/vinci/transport/VNSException.java | 4 +-
.../org/apache/vinci/transport/VinciClient.java | 12 +-
.../org/apache/vinci/transport/VinciFrame.java | 10 +-
.../org/apache/vinci/transport/VinciServer.java | 12 +-
.../apache/vinci/transport/XTalkTransporter.java | 110 +--
.../vinci/transport/context/VinciContext.java | 18 +-
.../apache/vinci/transport/document/AFrame.java | 8 +-
.../vinci/transport/document/XMLToVinci.java | 4 +-
.../vinci/transport/document/XMLToXTalk.java | 4 +-
.../vinci/transport/util/Base64Converter.java | 8 +-
.../apache/vinci/transport/util/UTFConverter.java | 22 +-
.../apache/vinci/transport/util/XMLConverter.java | 5 +-
.../vinci/transport/vns/client/ServeonResult.java | 6 +-
jcasgen-maven-plugin/pom.xml | 4 +-
.../uima/tools/jcasgen/maven/JCasGenMojo.java | 2 +-
pom.xml | 15 +-
src/main/readme/LICENSE | 2 +-
src/main/readme/NOTICE | 6 +-
uima-docbook-overview-and-setup/pom.xml | 9 +-
uima-docbook-references/pom.xml | 9 +-
uima-docbook-tools/pom.xml | 9 +-
uima-docbook-tutorials-and-users-guides/pom.xml | 9 +-
uimaj-adapter-soap/pom.xml | 9 +-
.../soap/AxisAnalysisEngineServiceStub.java | 8 +-
.../soap/AxisAnalysisEngineService_impl.java | 4 +-
.../adapter/soap/AxisResourceServiceManager.java | 2 +-
.../uima/adapter/soap/AxisResourceServiceStub.java | 5 +-
.../uima/adapter/soap/BinaryDeserializer.java | 3 +-
.../apache/uima/adapter/soap/XmlDeserializer.java | 3 +-
.../soap/axis11/BinaryDeserializer_Axis11.java | 3 +-
.../soap/axis11/XmlDeserializer_Axis11.java | 3 +-
uimaj-adapter-vinci/pom.xml | 9 +-
.../vinci/VinciAnalysisEngineServiceStub.java | 19 +-
.../vinci/VinciAnalysisEngineService_impl.java | 15 +-
.../VinciBinaryAnalysisEngineServiceStub.java | 11 +-
.../VinciBinaryAnalysisEngineService_impl.java | 14 +-
.../apache/uima/adapter/vinci/util/Descriptor.java | 3 +-
.../vinci/util/UimaSaxVinciFrameBuilder.java | 2 +-
uimaj-bootstrap/pom.xml | 9 +-
.../org/apache/uima/bootstrap/UimaBootstrap.java | 11 -
uimaj-component-test-util/pom.xml | 9 +-
.../AnnotatorPerformanceTester.java | 2 +-
.../uima/test/junit_extension/AnnotatorTester.java | 32 +-
.../junit_extension/PerformanceTestResult.java | 2 +-
.../junit_extension/PerformanceTestResultImpl.java | 2 +-
uimaj-core/pom.xml | 9 +-
.../src/main/java/org/apache/uima/Constants.java | 4 +-
.../main/java/org/apache/uima/ResourceFactory.java | 2 +-
.../main/java/org/apache/uima/UIMAFramework.java | 130 +++-
.../src/main/java/org/apache/uima/UimaContext.java | 27 +-
.../java/org/apache/uima/UimaContextAdmin.java | 4 +-
.../uima/analysis_component/AnalysisComponent.java | 5 +-
.../analysis_component/CasAnnotator_ImplBase.java | 1 +
.../analysis_component/CasMultiplier_ImplBase.java | 1 +
.../uima/analysis_engine/AnalysisEngine.java | 19 +-
.../analysis_engine/AnalysisEngineDescription.java | 23 +-
.../analysis_engine/AnalysisEngineManagement.java | 4 +-
.../analysis_engine/AnalysisEngineServiceStub.java | 3 +
.../uima/analysis_engine/ResultSpecification.java | 3 +-
.../annotator/AnnotatorContext.java | 32 +-
.../analysis_engine/annotator/BaseAnnotator.java | 1 +
.../org/apache/uima/analysis_engine/asb/ASB.java | 3 +-
.../uima/analysis_engine/asb/impl/ASB_impl.java | 4 +-
.../asb/impl/FlowControllerContainer.java | 4 +-
.../impl/AggregateAnalysisEngine_impl.java | 13 +-
.../impl/AnalysisEngineDescription_impl.java | 20 +-
.../impl/AnalysisEngineImplBase.java | 18 +-
.../impl/PrimitiveAnalysisEngine_impl.java | 6 +-
.../impl/ResultSpecification_impl.java | 4 +-
.../apache/uima/analysis_engine/impl/RsFeats.java | 2 +-
.../uima/analysis_engine/impl/RsFullFeatNames.java | 2 +-
.../apache/uima/analysis_engine/impl/RsLangs.java | 4 +-
.../apache/uima/analysis_engine/impl/RsType.java | 2 +-
.../analysis_engine/impl/TypeOrFeature_impl.java | 2 +-
.../impl/UimacppAnalysisEngineImpl.java | 15 +-
.../AnalysisComponentAdapterFactory.java | 4 +-
.../impl/compatibility/AnnotatorAdapter.java | 4 +-
.../impl/compatibility/CasConsumerAdapter.java | 4 +-
.../compatibility/CollectionReaderAdapter.java | 4 +-
.../metadata/impl/AnalysisEngineMetaData_impl.java | 26 +-
.../metadata/impl/SofaMapping_impl.java | 4 +-
.../service/impl/AnalysisEngineServiceAdapter.java | 4 +-
.../service/impl/AnalysisEngineService_impl.java | 3 +-
.../service/impl/ServiceDataCargo.java | 15 +-
.../src/main/java/org/apache/uima/cas/ArrayFS.java | 9 +-
.../java/org/apache/uima/cas/BooleanArrayFS.java | 6 +-
.../main/java/org/apache/uima/cas/ByteArrayFS.java | 5 +-
.../src/main/java/org/apache/uima/cas/CAS.java | 2 +-
.../java/org/apache/uima/cas/CASException.java | 2 +-
.../org/apache/uima/cas/CASRuntimeException.java | 6 +
.../main/java/org/apache/uima/cas/CasOwner.java | 2 +-
.../java/org/apache/uima/cas/CommonArrayFS.java | 4 +-
.../java/org/apache/uima/cas/DoubleArrayFS.java | 6 +-
.../src/main/java/org/apache/uima/cas/FSIndex.java | 2 +
.../org/apache/uima/cas/FSIndexRepository.java | 4 +-
.../java/org/apache/uima/cas/FeatureStructure.java | 5 +-
.../java/org/apache/uima/cas/FeatureValuePath.java | 8 +-
.../java/org/apache/uima/cas/FloatArrayFS.java | 6 +-
.../main/java/org/apache/uima/cas/IntArrayFS.java | 6 +-
.../main/java/org/apache/uima/cas/LongArrayFS.java | 6 +-
.../java/org/apache/uima/cas/ParsingException.java | 4 +-
.../java/org/apache/uima/cas/ShortArrayFS.java | 6 +-
.../src/main/java/org/apache/uima/cas/SofaFS.java | 13 +-
.../java/org/apache/uima/cas/StringArrayFS.java | 6 +-
.../apache/uima/cas/admin/CASAdminException.java | 3 +
.../java/org/apache/uima/cas/admin/CASMgr.java | 7 +-
.../org/apache/uima/cas/admin/LinearTypeOrder.java | 8 +-
.../uima/cas/admin/LinearTypeOrderBuilder.java | 3 +-
.../org/apache/uima/cas/admin/TypeSystemMgr.java | 2 +-
.../org/apache/uima/cas/impl/AnnotationImpl.java | 2 +-
.../apache/uima/cas/impl/AnnotationIndexImpl.java | 4 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 37 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 64 +-
.../java/org/apache/uima/cas/impl/CASImpl.java | 24 +-
.../org/apache/uima/cas/impl/CASMgrSerializer.java | 2 +-
.../org/apache/uima/cas/impl/CasSeqAddrMaps.java | 3 +-
.../apache/uima/cas/impl/CasTypeSystemMapper.java | 4 +-
.../java/org/apache/uima/cas/impl/FSBagIndex.java | 8 +-
.../java/org/apache/uima/cas/impl/FSGenerator.java | 8 +-
.../uima/cas/impl/FSIndexRepositoryImpl.java | 69 +-
...Impl.java => FSIndexRepositoryImpl.java.svntmp} | 69 +-
.../org/apache/uima/cas/impl/FSLeafIndexImpl.java | 27 +-
.../org/apache/uima/cas/impl/FSVectorIndex.java | 8 +-
.../apache/uima/cas/impl/FeatureValuePathImpl.java | 24 +-
.../uima/cas/impl/LinearTypeOrderBuilderImpl.java | 104 ++-
.../org/apache/uima/cas/impl/Serialization.java | 50 +-
.../java/org/apache/uima/cas/impl/Subiterator.java | 4 +-
.../java/org/apache/uima/cas/impl/TypeImpl.java | 2 +-
.../org/apache/uima/cas/impl/TypeSystemUtils.java | 2 +-
.../uima/cas/impl/UnambiguousIteratorImpl.java | 8 +-
.../org/apache/uima/cas/impl/XCASDeserializer.java | 11 +-
.../apache/uima/cas/impl/XCASParsingException.java | 16 +-
.../org/apache/uima/cas/impl/XCASSerializer.java | 47 +-
.../apache/uima/cas/impl/XmiCasDeserializer.java | 41 +-
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 57 +-
.../uima/cas/impl/XmiSerializationSharedData.java | 6 +-
.../org/apache/uima/cas/text/AnnotationIndex.java | 5 +-
.../java/org/apache/uima/cas/text/Language.java | 4 +-
.../org/apache/uima/cas_data/impl/CasDataImpl.java | 10 +-
.../uima/cas_data/impl/FeatureStructureImpl.java | 12 +-
.../uima/cas_data/impl/PrimitiveArrayFSImpl.java | 4 +-
.../uima/cas_data/impl/PrimitiveValueImpl.java | 8 +-
.../uima/cas_data/impl/ReferenceArrayFSImpl.java | 4 +-
.../uima/cas_data/impl/ReferenceValueImpl.java | 4 +-
.../cas_data/impl/XCasToCasDataSaxHandler.java | 6 -
.../org/apache/uima/collection/CasInitializer.java | 1 +
.../collection/CollectionProcessingEngine.java | 2 +-
.../collection/CollectionProcessingManager.java | 6 +-
.../apache/uima/collection/base_cpm/BaseCPM.java | 28 +-
.../collection/base_cpm/BaseCollectionReader.java | 2 +-
.../collection/base_cpm/CasObjectProcessor.java | 3 +-
.../base_cpm/RecoverableCollectionReader.java | 2 +-
.../impl/CasConsumerDescription_impl.java | 2 +-
.../impl/CasInitializerDescription_impl.java | 2 +-
.../impl/CollectionReaderDescription_impl.java | 7 +-
.../metadata/CasProcessorDeploymentParam.java | 12 +-
.../metadata/CasProcessorDeploymentParams.java | 4 +-
.../metadata/CasProcessorErrorRateThreshold.java | 2 +-
.../collection/metadata/CasProcessorExecArg.java | 4 +-
.../collection/metadata/CasProcessorExecArgs.java | 2 +-
.../metadata/CasProcessorExecutable.java | 2 +-
.../collection/metadata/CasProcessorFilter.java | 1 +
.../metadata/CasProcessorMaxRestarts.java | 4 +-
.../metadata/CasProcessorRuntimeEnvParam.java | 8 +-
.../uima/collection/metadata/CpeCasProcessor.java | 17 +-
.../uima/collection/metadata/CpeCasProcessors.java | 18 +-
.../uima/collection/metadata/CpeCheckpoint.java | 4 +-
.../collection/metadata/CpeCollectionReader.java | 5 +-
.../CpeCollectionReaderCasInitializer.java | 3 +-
.../metadata/CpeCollectionReaderIterator.java | 6 +-
.../metadata/CpeComponentDescriptor.java | 2 +-
.../uima/collection/metadata/CpeConfiguration.java | 12 +-
.../uima/collection/metadata/CpeDescription.java | 28 +-
.../collection/metadata/CpeLocalCasProcessor.java | 4 +-
.../apache/uima/collection/metadata/CpeTimer.java | 2 +-
.../uima/flow/CasFlowController_ImplBase.java | 2 +-
.../org/apache/uima/flow/CasFlow_ImplBase.java | 4 +-
.../src/main/java/org/apache/uima/flow/Flow.java | 2 +-
.../java/org/apache/uima/flow/FlowController.java | 4 +-
.../org/apache/uima/flow/JCasFlow_ImplBase.java | 2 +
.../apache/uima/flow/SimpleStepWithResultSpec.java | 4 +-
.../flow/impl/AnalysisSequenceCapabilityNode.java | 4 +-
.../uima/impl/ResourceSpecifierFactory_impl.java | 2 +-
.../org/apache/uima/impl/UIMAFramework_impl.java | 12 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 8 +-
.../uima/internal/util/AnalysisEnginePool.java | 4 +-
.../uima/internal/util/CharArraySpanMap.java | 6 +-
.../apache/uima/internal/util/CharArrayString.java | 16 +-
.../org/apache/uima/internal/util/GraphNode.java | 2 +-
.../java/org/apache/uima/internal/util/IntSet.java | 2 +-
.../org/apache/uima/internal/util/IntVector.java | 83 ++-
.../org/apache/uima/internal/util/JavaTimer.java | 4 +-
.../apache/uima/internal/util/MutableInteger.java | 4 +-
.../apache/uima/internal/util/ResourcePool.java | 2 +-
.../uima/internal/util/TextAnalysisEnginePool.java | 5 +-
.../apache/uima/internal/util/UIMAClassLoader.java | 2 +-
.../org/apache/uima/internal/util/XMLUtils.java | 2 +-
.../uima/internal/util/rb_trees/Int2IntRBT.java | 772 +-------------------
.../uima/internal/util/rb_trees/IntArrayRBT.java | 751 +------------------
.../internal/util/rb_trees/IntArrayRBTcommon.java | 794 +++++++++++++++++++++
.../internal/util/rb_trees/IntRedBlackTree.java | 2 +-
.../internal/util/text/INormalizationResult.java | 67 --
.../uima/internal/util/text/INormalizerType1.java | 47 --
.../src/main/java/org/apache/uima/jcas/JCas.java | 55 +-
.../java/org/apache/uima/jcas/JCasRegistry.java | 7 +-
.../org/apache/uima/jcas/cas/AnnotationBase.java | 4 +-
.../org/apache/uima/jcas/cas/BooleanArray.java | 8 +-
.../apache/uima/jcas/cas/BooleanArray_Type.java | 28 +-
.../java/org/apache/uima/jcas/cas/ByteArray.java | 8 +-
.../org/apache/uima/jcas/cas/ByteArray_Type.java | 27 +-
.../org/apache/uima/jcas/cas/CommonArray_Type.java | 5 +-
.../java/org/apache/uima/jcas/cas/DoubleArray.java | 8 +-
.../org/apache/uima/jcas/cas/DoubleArray_Type.java | 25 +-
.../java/org/apache/uima/jcas/cas/EmptyFSList.java | 2 +-
.../org/apache/uima/jcas/cas/EmptyFloatList.java | 2 +-
.../org/apache/uima/jcas/cas/EmptyIntegerList.java | 2 +-
.../org/apache/uima/jcas/cas/EmptyStringList.java | 2 +-
.../java/org/apache/uima/jcas/cas/FSArray.java | 12 +-
.../org/apache/uima/jcas/cas/FSArray_Type.java | 29 +-
.../main/java/org/apache/uima/jcas/cas/FSList.java | 2 +-
.../java/org/apache/uima/jcas/cas/FloatArray.java | 8 +-
.../org/apache/uima/jcas/cas/FloatArray_Type.java | 34 +-
.../java/org/apache/uima/jcas/cas/FloatList.java | 2 +-
.../org/apache/uima/jcas/cas/IntegerArray.java | 8 +-
.../apache/uima/jcas/cas/IntegerArray_Type.java | 28 +-
.../java/org/apache/uima/jcas/cas/IntegerList.java | 2 +-
.../java/org/apache/uima/jcas/cas/LongArray.java | 8 +-
.../org/apache/uima/jcas/cas/LongArray_Type.java | 32 +-
.../org/apache/uima/jcas/cas/NonEmptyFSList.java | 10 +-
.../apache/uima/jcas/cas/NonEmptyFloatList.java | 10 +-
.../apache/uima/jcas/cas/NonEmptyIntegerList.java | 10 +-
.../apache/uima/jcas/cas/NonEmptyStringList.java | 10 +-
.../java/org/apache/uima/jcas/cas/ShortArray.java | 8 +-
.../org/apache/uima/jcas/cas/ShortArray_Type.java | 27 +-
.../main/java/org/apache/uima/jcas/cas/Sofa.java | 8 +-
.../java/org/apache/uima/jcas/cas/StringArray.java | 8 +-
.../org/apache/uima/jcas/cas/StringArray_Type.java | 25 +-
.../java/org/apache/uima/jcas/cas/StringList.java | 2 +-
.../main/java/org/apache/uima/jcas/cas/TOP.java | 27 +-
.../java/org/apache/uima/jcas/cas/TOP_Type.java | 14 +-
.../java/org/apache/uima/jcas/impl/JCasImpl.java | 6 +-
.../java/org/apache/uima/jcas/tcas/Annotation.java | 15 +-
.../org/apache/uima/jcas/tcas/Annotation_Type.java | 2 +
.../uima/pear/tools/InstallationController.java | 52 +-
.../uima/pear/tools/InstallationProcessor.java | 6 +-
.../apache/uima/pear/tools/InstallationTester.java | 4 +-
.../uima/pear/tools/LocalInstallationAgent.java | 26 +-
.../org/apache/uima/pear/tools/PackageBrowser.java | 6 +-
.../org/apache/uima/pear/util/MessageRouter.java | 4 +-
.../java/org/apache/uima/pear/util/StringUtil.java | 7 +-
.../java/org/apache/uima/pear/util/XMLUtil.java | 2 +
.../java/org/apache/uima/resource/CasManager.java | 3 +-
.../apache/uima/resource/ConfigurableResource.java | 4 +-
.../apache/uima/resource/ConfigurationManager.java | 4 +-
.../uima/resource/JMSMessagingSpecifier.java | 8 +-
.../apache/uima/resource/MQMessagingSpecifier.java | 8 +-
.../uima/resource/MailMessagingSpecifier.java | 8 +-
.../org/apache/uima/resource/ManagementObject.java | 3 +-
.../apache/uima/resource/MessagingSpecifier.java | 8 +-
.../java/org/apache/uima/resource/Resource.java | 4 +-
.../resource/ResourceInitializationException.java | 8 +-
.../org/apache/uima/resource/ResourceManager.java | 7 +-
.../uima/resource/ResourceManagerPearWrapper.java | 2 +-
.../apache/uima/resource/ResourceServiceStub.java | 1 +
.../java/org/apache/uima/resource/Session.java | 12 +-
.../ConfigurableDataResourceSpecifier_impl.java | 2 +-
.../impl/ConfigurableDataResource_impl.java | 2 +-
.../impl/ConfigurationManagerImplBase.java | 4 +-
.../uima/resource/impl/DataResource_impl.java | 2 +-
.../impl/ExternalResourceDependency_impl.java | 16 +-
.../impl/ExternalResourceDescription_impl.java | 24 +-
.../resource/impl/FileResourceSpecifier_impl.java | 2 +-
.../impl/ResourceCreationSpecifier_impl.java | 19 +-
.../uima/resource/impl/ResourceState_impl.java | 10 +-
.../resource/impl/SessionNamespaceView_impl.java | 4 +-
.../apache/uima/resource/impl/Session_impl.java | 4 +-
.../uima/resource/impl/URISpecifier_impl.java | 10 +-
.../apache/uima/resource/metadata/Capability.java | 6 +-
.../uima/resource/metadata/ConfigurationGroup.java | 4 +-
.../ConfigurationParameterDeclarations.java | 4 +-
.../metadata/ConfigurationParameterSettings.java | 2 +-
.../uima/resource/metadata/MetaDataObject.java | 4 +-
.../resource/metadata/impl/AllowedValue_impl.java | 10 +-
.../resource/metadata/impl/Capability_impl.java | 26 +-
.../metadata/impl/ConfigurationGroup_impl.java | 12 +-
.../ConfigurationParameterDeclarations_impl.java | 71 +-
.../impl/ConfigurationParameterSettings_impl.java | 24 +-
.../metadata/impl/ConfigurationParameter_impl.java | 36 +-
.../impl/ExternalResourceBinding_impl.java | 4 +-
.../metadata/impl/FeatureDescription_impl.java | 12 +-
.../metadata/impl/FsIndexCollection_impl.java | 17 +-
.../metadata/impl/FsIndexDescription_impl.java | 20 +-
.../metadata/impl/FsIndexKeyDescription_impl.java | 17 +-
.../uima/resource/metadata/impl/Import_impl.java | 6 +-
.../metadata/impl/MetaDataObject_impl.java | 141 ++--
.../metadata/impl/MimeTypePrecondition_impl.java | 2 +-
.../impl/ProcessingResourceMetaData_impl.java | 4 +-
.../resource/metadata/impl/PropertyXmlInfo.java | 8 +-
.../metadata/impl/ResourceMetaData_impl.java | 54 +-
.../metadata/impl/SimplePrecondition_impl.java | 13 +-
.../metadata/impl/TypeDescription_impl.java | 29 +-
.../metadata/impl/TypePriorities_impl.java | 54 +-
.../metadata/impl/TypePriorityList_impl.java | 10 +-
.../metadata/impl/TypeSystemDescription_impl.java | 43 +-
.../service/impl/ResourceServiceAdapter.java | 3 +-
.../service/impl/ResourceService_impl.java | 1 -
.../main/java/org/apache/uima/search/Filter.java | 4 +-
.../apache/uima/search/impl/Attribute_impl.java | 2 +-
.../org/apache/uima/search/impl/Filter_impl.java | 4 +-
.../org/apache/uima/search/impl/Mapping_impl.java | 4 +-
.../org/apache/uima/search/impl/Style_impl.java | 2 +-
.../uima/uimacpp/UimacppAnalysisComponent.java | 17 +-
.../org/apache/uima/uimacpp/UimacppEngine.java | 22 +-
.../main/java/org/apache/uima/util/CasCopier.java | 40 +-
.../org/apache/uima/util/CasCreationUtils.java | 19 +-
.../main/java/org/apache/uima/util/CasPool.java | 4 +-
.../java/org/apache/uima/util/CasToInlineXml.java | 9 +
.../main/java/org/apache/uima/util/FileUtils.java | 1 +
.../main/java/org/apache/uima/util/JCasPool.java | 3 +
.../java/org/apache/uima/util/NameClassPair.java | 2 +-
.../main/java/org/apache/uima/util/Settings.java | 4 +-
.../apache/uima/util/SimpleResourceFactory.java | 1 +
.../java/org/apache/uima/util/TCasToInlineXml.java | 10 +-
.../java/org/apache/uima/util/TypeSystemUtil.java | 1 +
.../main/java/org/apache/uima/util/UriUtils.java | 10 +-
.../main/java/org/apache/uima/util/XMLParser.java | 6 +-
.../main/java/org/apache/uima/util/XMLizable.java | 10 +-
.../java/org/apache/uima/util/impl/DataIO.java | 58 +-
.../apache/uima/util/impl/JSR47Logger_impl.java | 4 +-
.../apache/uima/util/impl/Log4jLogger_impl.java | 4 +-
.../org/apache/uima/util/impl/OptimizeStrings.java | 15 +-
.../apache/uima/util/impl/ProcessTrace_impl.java | 4 +-
.../uima/util/impl/SaxDeserializer_impl.java | 57 +-
.../uima/util/impl/SerializationMeasures.java | 4 +-
.../org/apache/uima/util/impl/Settings_impl.java | 10 +-
.../org/apache/uima/util/impl/XMLParser_impl.java | 2 +-
.../apache/uima/UIMAException_Messages.properties | 13 +-
.../test/java/org/apache/lang/LanguagePair.java | 14 +-
.../impl/AnalysisEngine_implTest.java | 25 +-
.../impl/FlowControllerForErrorTest.java | 4 +-
.../analysis_engine/impl/NewlineResegmenter.java | 4 +-
.../analysis_engine/impl/NewlineSegmenter.java | 4 +-
.../uima/analysis_engine/impl/TabSegmenter.java | 4 +-
.../uima/analysis_engine/impl/TestAnnotator2.java | 4 +-
.../apache/uima/cas/impl/ComponentInfoTest.java | 4 +-
.../org/apache/uima/cas/impl/FeaturePathTest.java | 28 +-
.../java/org/apache/uima/cas/impl/SerDesTest4.java | 5 +-
.../uima/cas/impl/XmiCasDeserializerTest.java | 51 +-
.../apache/uima/cas/impl/XmiCasSerializerTest.java | 53 +-
.../org/apache/uima/cas/test/CrossAnnotation.java | 6 +-
.../apache/uima/cas/test/FeatureStructureTest.java | 16 +
.../apache/uima/cas/test/IndexComparitorTest.java | 4 +-
.../apache/uima/cas/test/IndexRepositoryTest.java | 111 ++-
.../org/apache/uima/cas/test/JcasSofaTest.java | 4 +-
.../java/org/apache/uima/cas/test/SofaTest.java | 4 +-
.../uima/flow/impl/FixedFlowControllerTest.java | 4 +-
.../uima/impl/AnalysisEngineFactory_implTest.java | 4 +-
.../uima/impl/CasConsumerFactory_implTest.java | 4 +-
.../impl/CollectionReaderFactory_implTest.java | 4 +-
.../CustomResourceSpecifierFactory_implTest.java | 4 +-
.../org/apache/uima/impl/SomeCustomResource.java | 4 +-
.../apache/uima/internal/util/IntVectorTest.java | 82 +++
.../internal/util/rb_trees/IntArrayRBTtest.java | 26 +
.../java/org/apache/uima/jcas/test/JCasTest.java | 5 +-
.../apache/uima/pear/util/PearInstallerTest.java | 3 -
.../org/apache/uima/pear/util/PearRuntimeTest.java | 12 +-
.../uima/resource/impl/CasManager_implTest.java | 4 +-
...ConfigurableDataResourceSpecifier_implTest.java | 4 +-
.../uima/resource/impl/PearSpecifier_implTest.java | 8 +-
.../impl/ResourceCreationSpecifier_implTest.java | 4 +-
.../java/org/apache/uima/util/CasCopierTest.java | 39 +-
.../org/apache/uima/util/CasToInlineXmlTest.java | 4 +-
.../org/apache/uima/util/CasWrapperForTstng.java | 299 ++++++++
.../java/org/apache/uima/util/FileUtilsTest.java | 4 +-
uimaj-core/src/test/java/x/y/z/EndOfSentence.java | 2 +-
uimaj-core/src/test/java/x/y/z/Sentence.java | 2 +-
uimaj-core/src/test/java/x/y/z/Separator.java | 2 +-
uimaj-core/src/test/java/x/y/z/Token.java | 22 +-
uimaj-core/src/test/java/x/y/z/TokenType.java | 2 +-
uimaj-core/src/test/java/x/y/z/Word.java | 2 +-
.../AnnotatorWithGroupParameterError.xml | 6 +-
uimaj-cpe/checkpoint.dat.prev | Bin 704 -> 971 bytes
uimaj-cpe/pom.xml | 9 +-
.../impl/CollectionProcessingEngine_impl.java | 4 +-
.../base_cpm/container/CasProcessorController.java | 3 +-
.../base_cpm/container/KillPipelineException.java | 4 +-
.../container/deployer/CasProcessorDeployer.java | 9 -
.../uima/collection/impl/cpm/BaseCPMImpl.java | 15 +-
.../apache/uima/collection/impl/cpm/CPEConfig.java | 9 +-
.../apache/uima/collection/impl/cpm/CPMImpl.java | 36 +-
.../uima/collection/impl/cpm/Checkpoint.java | 2 +-
.../collection/impl/cpm/container/CPEContext.java | 8 +-
.../collection/impl/cpm/container/CPEFactory.java | 50 +-
.../CasObjectNetworkCasProcessorImpl.java | 15 +-
.../CasProcessorConfigurationJAXBImpl.java | 11 +-
.../cpm/container/NetworkCasProcessorImpl.java | 8 +-
.../cpm/container/ProcessingContainer_Impl.java | 37 +-
.../container/deployer/CPEDeployerDefaultImpl.java | 17 +-
.../impl/cpm/container/deployer/DeployFactory.java | 16 +-
.../container/deployer/FencedProcessReaper.java | 4 +-
.../cpm/container/deployer/JavaApplication.java | 12 +-
.../cpm/container/deployer/NonJavaApplication.java | 6 +-
.../container/deployer/RunnableApplication.java | 4 +-
.../impl/cpm/container/deployer/VinciTAP.java | 21 +-
.../deployer/socket/OFSocketTransportImpl.java | 4 +-
.../deployer/socket/ProcessControllerAdapter.java | 9 +-
.../socket/SocketCasProcessorDeployer.java | 9 +-
.../container/deployer/socket/SocketTransport.java | 15 +-
.../deployer/vinci/VinciCasProcessorDeployer.java | 43 +-
.../impl/cpm/container/deployer/vns/LocalVNS.java | 9 +-
.../impl/cpm/engine/ArtifactProducer.java | 2 +-
.../collection/impl/cpm/engine/CPECasPool.java | 8 +-
.../impl/cpm/engine/CPMChunkTimeoutException.java | 7 +-
.../uima/collection/impl/cpm/engine/CPMEngine.java | 65 +-
.../impl/cpm/engine/ConsumerCasUtils.java | 2 +-
.../impl/cpm/engine/NonThreadedProcessingUnit.java | 28 +-
.../collection/impl/cpm/engine/ProcessingUnit.java | 30 +-
.../collection/impl/cpm/engine/SequencedQueue.java | 4 +-
.../uima/collection/impl/cpm/engine/WorkUnit.java | 8 +-
.../uima/collection/impl/cpm/utils/CPMUtils.java | 24 +-
.../collection/impl/cpm/utils/ChunkMetadata.java | 6 +-
.../uima/collection/impl/cpm/utils/Execute.java | 4 +-
.../uima/collection/impl/cpm/utils/Filter.java | 6 +-
.../collection/impl/cpm/utils/QueueEntity.java | 4 +-
.../collection/impl/cpm/utils/TimerFactory.java | 2 +-
.../collection/impl/cpm/vinci/DATACasUtils.java | 26 +-
.../uima/collection/impl/cpm/vinci/Vinci.java | 10 +-
.../impl/metadata/cpe/CasProcessorCpeObject.java | 43 +-
.../cpe/CasProcessorDeploymentParamImpl.java | 8 +-
.../cpe/CasProcessorErrorRateThresholdImpl.java | 2 +-
.../impl/metadata/cpe/CasProcessorExecArgImpl.java | 2 +-
.../metadata/cpe/CasProcessorExecutableImpl.java | 10 +-
.../impl/metadata/cpe/CasProcessorFilterImpl.java | 2 +-
.../metadata/cpe/CasProcessorMaxRestartsImpl.java | 4 +-
.../cpe/CasProcessorRunInSeperateProcessImpl.java | 2 +-
.../cpe/CasProcessorRuntimeEnvParamImpl.java | 4 +-
.../impl/metadata/cpe/CasProcessorTimeoutImpl.java | 6 +-
.../impl/metadata/cpe/CpeCheckpointImpl.java | 6 +-
.../cpe/CpeCollectionReaderCasInitializerImpl.java | 4 +-
.../cpe/CpeCollectionReaderIteratorImpl.java | 8 +-
.../impl/metadata/cpe/CpeConfigurationImpl.java | 19 +-
.../impl/metadata/cpe/CpeDescriptorFactory.java | 103 +--
.../impl/metadata/cpe/CpeIncludeImpl.java | 3 -
.../metadata/cpe/CpeRemoteCasProcessorImpl.java | 4 +-
.../cpe/CpeResourceManagerConfigurationImpl.java | 3 -
.../impl/metadata/cpe/CpeSofaMappingImpl.java | 4 +-
.../impl/metadata/cpe/CpeSofaMappingsImpl.java | 4 +-
.../impl/metadata/cpe/OutputQueue_impl.java | 4 +-
.../uima/collection/impl/cpm/CasPoolTest.java | 4 +-
.../impl/cpm/CpeCasProcessorAPI_Test.java | 6 +-
.../impl/cpm/CpeDescriptorSerialization_Test.java | 10 +-
.../uima/collection/impl/cpm/CpeImportTest.java | 2 +-
.../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 28 +-
.../impl/cpm/CpmCasConsumer_ErrorTest.java | 14 +-
.../impl/cpm/CpmCollectionReader_ErrorTest.java | 24 +-
.../collection/impl/cpm/CpmProcessingTest.java | 10 +-
.../uima/collection/impl/cpm/PearCasPoolTest.java | 4 +-
.../impl/cpm/utils/ErrorTestAnnotator.java | 4 +-
.../impl/cpm/utils/ErrorTestCasConsumer.java | 4 +-
.../impl/cpm/utils/FunctionErrorStore.java | 4 +-
.../collection/impl/cpm/utils/SlowAnnotator.java | 4 +-
uimaj-document-annotation/pom.xml | 9 +-
.../apache/uima/jcas/tcas/DocumentAnnotation.java | 4 +-
.../uima/jcas/tcas/DocumentAnnotationTest.java | 4 +-
uimaj-eclipse-feature-runtime/feature.xml | 4 +-
uimaj-eclipse-feature-runtime/pom.xml | 9 +-
uimaj-eclipse-feature-tools/feature.xml | 18 +-
uimaj-eclipse-feature-tools/pom.xml | 9 +-
uimaj-eclipse-update-site/pom.xml | 35 +-
uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF | 40 +-
uimaj-ep-cas-editor-ide/pom.xml | 16 +-
.../uima/caseditor/ide/CasEditorIdePlugin.java | 4 +-
.../ide/TypeSystemLocationPropertyPage.java | 2 +-
.../src/main/resources/META-INF/LICENSE | 2 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
uimaj-ep-cas-editor/META-INF/MANIFEST.MF | 58 +-
uimaj-ep-cas-editor/pom.xml | 17 +-
.../org/apache/uima/caseditor/CasEditorPlugin.java | 4 +-
.../uima/caseditor/core/model/DefaultColors.java | 1 -
.../core/model/dotcorpus/DotCorpusSerializer.java | 4 +-
.../uima/caseditor/editor/AnnotationEditor.java | 7 +-
.../uima/caseditor/editor/AnnotationStyle.java | 6 +-
.../uima/caseditor/editor/CasDocumentProvider.java | 2 +-
.../uima/caseditor/editor/CasEditorError.java | 4 +-
.../uima/caseditor/editor/DocumentUimaImpl.java | 10 +-
.../editor/FeatureStructureSelection.java | 4 +-
.../editor/FeatureStructureSelectionIterator.java | 2 +-
.../apache/uima/caseditor/editor/FeatureValue.java | 3 +-
.../caseditor/editor/ICasDocumentListener.java | 1 -
.../action/DeleteFeatureStructureAction.java | 2 +-
.../action/LowerLeftAnnotationSideAction.java | 2 +-
.../action/LowerRightAnnotationSideAction.java | 2 +-
.../editor/action/MergeAnnotationAction.java | 2 +-
.../action/WideLeftAnnotationSideAction.java | 2 +-
.../action/WideRightAnnotationSideAction.java | 2 +-
.../caseditor/editor/annotation/DrawingStyle.java | 2 +-
.../editor/annotation/EclipseAnnotationPeer.java | 4 +-
.../editor/annotation/TagDrawingStrategy.java | 4 +-
.../caseditor/editor/contextmenu/ModeMenu.java | 2 +-
.../editor/contextmenu/ShowAnnotationsMenu.java | 2 +-
.../fsview/FeatureStructureBrowserViewPage.java | 6 +-
.../uima/caseditor/editor/fsview/TypeCombo.java | 2 +-
.../editor/outline/OutlineContentProviderBase.java | 2 +-
.../editor/outline/OutlineTableSorter.java | 4 +-
.../uima/caseditor/editor/util/Primitives.java | 6 +-
.../src/main/resources/META-INF/LICENSE | 2 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
.../model/dotcorpus/DotCorpusSerializerTest.java | 2 +-
uimaj-ep-configurator/META-INF/MANIFEST.MF | 26 +-
uimaj-ep-configurator/pom.xml | 9 +-
.../uima/taeconfigurator/InternalErrorCDE.java | 4 +-
.../taeconfigurator/TAEConfiguratorPlugin.java | 2 +-
.../taeconfigurator/editors/MultiPageEditor.java | 22 +-
.../editors/point/IUimaEditorExtension.java | 6 +-
.../editors/ui/AbstractImportablePartSection.java | 3 +-
.../editors/ui/AbstractSection.java | 23 +-
.../editors/ui/AbstractSectionParm.java | 16 +-
.../editors/ui/AggregateSection.java | 2 +-
.../editors/ui/CapabilitySection.java | 2 -
.../taeconfigurator/editors/ui/FlowSection.java | 11 +-
.../taeconfigurator/editors/ui/GeneralSection.java | 3 +-
.../taeconfigurator/editors/ui/HeaderPage.java | 1 -
.../editors/ui/HeaderPageWithSash.java | 9 +-
.../taeconfigurator/editors/ui/ImportSection.java | 4 +-
.../taeconfigurator/editors/ui/IndexSection.java | 1 -
.../taeconfigurator/editors/ui/OverviewPage.java | 4 +-
.../editors/ui/ParameterDelegatesSection.java | 3 +-
.../editors/ui/ParameterSection.java | 10 +-
.../editors/ui/ParameterSettingsSection.java | 5 -
.../taeconfigurator/editors/ui/SettingsPage.java | 6 -
.../taeconfigurator/editors/ui/SofaMapSection.java | 6 +-
.../taeconfigurator/editors/ui/TypeSection.java | 8 +-
.../uima/taeconfigurator/editors/ui/Utility.java | 9 +-
.../editors/ui/dialogs/AbstractDialog.java | 4 +-
.../editors/ui/dialogs/AddAllowedValueDialog.java | 2 +-
.../ui/dialogs/AddCapabilityFeatureDialog.java | 2 +-
.../ui/dialogs/AddCapabilityTypeDialog.java | 2 +-
.../editors/ui/dialogs/AddFeatureDialog.java | 5 +-
.../editors/ui/dialogs/AddIndexDialog.java | 2 +-
.../editors/ui/dialogs/AddParameterDialog.java | 2 +-
.../editors/ui/dialogs/AddSofaDialog.java | 4 +-
.../ui/dialogs/AddTypeToPriorityListDialog.java | 6 +-
.../editors/ui/dialogs/EditSofaBindingsDialog.java | 5 +-
.../editors/ui/dialogs/FindComponentDialog.java | 6 +-
.../editors/ui/dialogs/PickTaeForTypesDialog.java | 6 +-
.../editors/ui/dialogs/SelectTypeDialog.java | 5 +-
.../uima/taeconfigurator/model/AllTypes.java | 2 +-
uimaj-ep-debug/META-INF/MANIFEST.MF | 10 +-
uimaj-ep-debug/pom.xml | 9 +-
uimaj-ep-jcasgen/META-INF/MANIFEST.MF | 10 +-
uimaj-ep-jcasgen/pom.xml | 10 +-
uimaj-ep-launcher/META-INF/MANIFEST.MF | 10 +-
uimaj-ep-launcher/pom.xml | 9 +-
uimaj-ep-pear-packager/META-INF/MANIFEST.MF | 16 +-
uimaj-ep-pear-packager/pom.xml | 9 +-
.../java/org/apache/uima/pear/PearException.java | 4 +-
.../org/apache/uima/pear/generate/PearExport.java | 4 +-
.../uima/pear/generate/PearExportOperation.java | 2 +-
.../uima/pear/insd/edit/INSDComponentPage.java | 2 +-
.../edit/vars/AbstractVarValViewerHandler.java | 2 -
uimaj-ep-runtime/META-INF/MANIFEST.MF | 140 ++--
uimaj-ep-runtime/pom.xml | 10 +-
uimaj-examples/pom.xml | 9 +-
.../org/apache/uima/examples/cpe/SimpleRunCPE.java | 4 +-
.../org/apache/uima/examples/cpe/SimpleRunCPM.java | 4 +-
.../uima/examples/xmi/XmiEcoreCasConsumer.java | 6 +-
.../uima/examples/xmi/XmiWriterCasConsumer.java | 6 +-
uimaj-parent/pom.xml | 61 +-
uimaj-test-util/pom.xml | 9 +-
.../uima/test/junit_extension/FileCompare.java | 16 +-
.../test/junit_extension/ManageOutputDevice.java | 6 +-
uimaj-tools/pom.xml | 9 +-
.../apache/uima/tools/AnnotationViewerMain.java | 16 +-
.../tools/components/XmiWriterCasConsumer.java | 6 +-
.../java/org/apache/uima/tools/cpm/CpmPanel.java | 8 +-
.../org/apache/uima/tools/cpm/MetaDataPanel.java | 2 +-
.../apache/uima/tools/cvd/AnnotationExtent.java | 4 +-
.../java/org/apache/uima/tools/cvd/ArrayNode.java | 4 +-
.../java/org/apache/uima/tools/cvd/ColorIcon.java | 4 +-
.../java/org/apache/uima/tools/cvd/FSTreeNode.java | 4 +-
.../java/org/apache/uima/tools/cvd/MainFrame.java | 6 +-
.../org/apache/uima/tools/cvd/MarkupExtent.java | 4 +-
.../tools/cvd/control/FileOpenEventHandler.java | 4 +-
.../uima/tools/cvd/control/IndexPopupListener.java | 4 +-
.../tools/cvd/control/ShowTypesystemHandler.java | 4 +-
.../apache/uima/tools/cvd/tsview/MainFrame.java | 4 +-
.../tools/docanalyzer/AnnotationViewerDialog.java | 13 +-
.../uima/tools/docanalyzer/DocumentAnalyzer.java | 6 +-
.../uima/tools/docanalyzer/PrefsMediator.java | 4 +-
.../uima/tools/jcasgen/JCasTypeTemplate.java | 20 +-
.../uima/tools/jcasgen/JCas_TypeTemplate.java | 14 +-
.../java/org/apache/uima/tools/jcasgen/Jg.java | 12 +-
.../jcasgen/readme-how-to-regenerate-templates.txt | 36 +
.../uima/tools/migration/IbmUimaToApacheUima.java | 6 +-
.../uima/tools/pear/install/InstallPear.java | 2 +-
.../uima/tools/pear/merger/PMController.java | 2 +-
.../apache/uima/tools/pear/merger/PMUimaAgent.java | 14 +-
.../apache/uima/tools/stylemap/StyleMapEditor.java | 2 +-
.../apache/uima/tools/util/gui/FileSelector.java | 1 -
.../util/htmlview/AnnotationViewGenerator.java | 6 +-
.../uima/tools/viewer/CasAnnotationViewer.java | 22 +-
.../includedTemplates/AnnotationMethods.javajet | 14 +-
.../includedTemplates/Annotation_Methods.javajet | 5 +-
.../javajet/jcasgen/templates/JCasType.javajet | 48 +-
.../javajet/jcasgen/templates/JCas_Type.javajet | 31 +-
.../org/apache/uima/tools/jcasgen/jMergeCtl.xml | 81 ++-
.../uima/tools/pear/merger/PearMergerTest.java | 2 +-
626 files changed, 5012 insertions(+), 4871 deletions(-)
--
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