[uimaj] 01/03: Merge tag 'upstream/2.6.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri May 23 22:10:29 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 e7864c24a66672e3711b010efe57166e32fe7840
Merge: 5705b91 aa3204f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri May 23 23:23:36 2014 +0200
Merge tag 'upstream/2.6.0'
Upstream version 2.6.0
DEPENDENCIES | 40 +-
PearPackagingMavenPlugin/pom.xml | 8 +-
README | 19 +-
RELEASE_NOTES.html | 17 +-
aggregate-uimaj-docbooks/pom.xml | 8 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 8 +-
aggregate-uimaj/pom.xml | 8 +-
issuesFixed/css/maven-base.css | 306 ++++-----
issuesFixed/css/print.css | 14 +-
issuesFixed/jira-report.html | 399 ++++++++++--
jVinci/pom.xml | 8 +-
jcasgen-maven-plugin/pom.xml | 4 +-
pom.xml | 10 +-
src/main/readme_src/addSourceToJars.bat | 2 +-
uima-docbook-overview-and-setup/pom.xml | 8 +-
.../src/docbook/eclipse_setup.xml | 9 +-
.../src/docbook/faqs.xml | 7 +-
uima-docbook-references/pom.xml | 8 +-
uima-docbook-tools/pom.xml | 8 +-
uima-docbook-tools/src/docbook/tools.jcasgen.xml | 18 +-
uima-docbook-tutorials-and-users-guides/pom.xml | 8 +-
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 | 8 +-
.../main/java/org/apache/uima/UIMAFramework.java | 26 +-
.../java/org/apache/uima/UIMARuntimeException.java | 8 +
.../uima/analysis_engine/asb/impl/ASB_impl.java | 3 +-
.../impl/AggregateAnalysisEngine_impl.java | 1 +
.../impl/AnalysisEngineDescription_impl.java | 172 ++---
.../impl/PearAnalysisEngineWrapper.java | 6 +-
.../impl/PrimitiveAnalysisEngine_impl.java | 22 +-
.../uima/analysis_engine/impl/RsFullFeatNames.java | 49 +-
.../apache/uima/analysis_engine/impl/RsLang.java | 24 +-
.../metadata/impl/AnalysisEngineMetaData_impl.java | 2 +-
.../impl/FlowControllerDeclaration_impl.java | 8 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 4 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 2 +-
.../apache/uima/cas/impl/CasTypeSystemMapper.java | 8 +-
.../uima/cas/impl/FSIndexComparatorImpl.java | 20 +-
.../uima/cas/impl/FSIndexRepositoryImpl.java | 111 +++-
.../org/apache/uima/cas/impl/FSIntArrayIndex.java | 93 +--
.../apache/uima/cas/impl/FSIteratorWrapper.java | 5 +
.../org/apache/uima/cas/impl/FSLeafIndexImpl.java | 71 ++-
.../main/java/org/apache/uima/cas/impl/Heap.java | 5 +
.../java/org/apache/uima/cas/impl/TypeImpl.java | 3 +
.../org/apache/uima/cas/impl/TypeSystemImpl.java | 62 +-
.../apache/uima/flow/FlowController_ImplBase.java | 2 +-
.../apache/uima/flow/impl/FixedFlowController.java | 22 +-
.../apache/uima/impl/ChildUimaContext_impl.java | 12 +-
.../org/apache/uima/impl/RootUimaContext_impl.java | 46 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 188 ++++--
.../uima/internal/util/CommandLineParser.java | 4 +-
.../org/apache/uima/internal/util/IntVector.java | 7 +-
.../apache/uima/internal/util/JmxMBeanAgent.java | 111 ++--
.../org/apache/uima/internal/util/SymbolTable.java | 40 +-
.../apache/uima/internal/util/UIMAClassLoader.java | 35 +-
.../uima/internal/util/rb_trees/IntArrayRBT.java | 7 +
.../org/apache/uima/jcas/cas/AnnotationBase.java | 19 +-
.../java/org/apache/uima/jcas/cas/TOP_Type.java | 5 +-
.../org/apache/uima/jcas/impl/JCasHashMap.java | 702 +++++++++++++++++----
.../java/org/apache/uima/jcas/impl/JCasImpl.java | 43 +-
.../apache/uima/resource/ConfigurationManager.java | 3 +
.../uima/resource/ExternalResourceDescription.java | 1 +
.../resource/ResourceInitializationException.java | 6 +
.../org/apache/uima/resource/ResourceManager.java | 5 +
.../apache/uima/resource/Resource_ImplBase.java | 48 +-
.../apache/uima/resource/impl/CasManager_impl.java | 113 +++-
.../impl/ConfigurationManagerImplBase.java | 41 +-
.../resource/impl/ConfigurationManager_impl.java | 4 +-
.../impl/CustomResourceSpecifier_impl.java | 5 +-
.../impl/ResourceManagerPearWrapper_impl.java | 42 +-
.../uima/resource/impl/ResourceManager_impl.java | 262 ++++----
.../apache/uima/resource/metadata/Capability.java | 1 +
.../resource/metadata/ExternalResourceBinding.java | 1 +
.../uima/resource/metadata/FsIndexDescription.java | 1 +
.../org/apache/uima/resource/metadata/Import.java | 2 +
.../uima/resource/metadata/MetaDataObject.java | 2 +
.../uima/resource/metadata/TypeDescription.java | 1 +
.../uima/resource/metadata/TypePriorityList.java | 1 +
.../resource/metadata/TypeSystemDescription.java | 1 +
.../resource/metadata/impl/Capability_impl.java | 9 +-
.../impl/ConfigurationParameterSettings_impl.java | 23 +
.../metadata/impl/FsIndexCollection_impl.java | 108 ++--
.../metadata/impl/MetaDataObject_impl.java | 345 +++++++---
.../impl/ResourceManagerConfiguration_impl.java | 103 +--
.../metadata/impl/TypePriorities_impl.java | 166 +++--
.../metadata/impl/TypePriorityList_impl.java | 17 +-
.../metadata/impl/TypeSystemDescription_impl.java | 103 +--
.../org/apache/uima/util/CasCreationUtils.java | 3 +
.../main/java/org/apache/uima/util/CasPool.java | 240 ++++---
.../java/org/apache/uima/util/CasToInlineXml.java | 152 +++--
.../uima/util/ConcurrentHashMapWithProducer.java | 67 ++
.../org/apache/uima/util/impl/XMLParser_impl.java | 92 ++-
.../apache/uima/UIMAException_Messages.properties | 6 +
.../impl/AnalysisEngineDescription_implTest.java | 124 +++-
.../MultiprocessingAnalysisEngine_implTest.java | 23 +-
.../impl/TaeDescription_implTest.java | 5 +
.../java/org/apache/uima/cas/impl/CasPoolTest.java | 125 +++-
.../uima/cas/impl/CasTypeSystemMapperTst.java | 42 ++
.../java/org/apache/uima/cas/impl/SerDesTest6.java | 36 +-
.../apache/uima/cas/test/GrowingTheCasTest.java | 21 +
.../cas/test/GrowingTheCasTestNoJcasCache.java | 2 +
.../apache/uima/cas/test/IndexComparitorTest.java | 29 +-
.../apache/uima/cas/test/IndexRepositoryTest.java | 6 +
.../uima/cas/test/IndexSerializationTest.java | 14 +
.../org/apache/uima/cas/test/IteratorTest.java | 504 ++++++++-------
.../org/apache/uima/cas/test/JcasSofaTest.java | 7 +-
.../uima/cas/test/NewPrimitiveTypesTest.java | 22 +
.../java/org/apache/uima/cas/test/SofaTest.java | 10 +-
.../apache/uima/cas/test/StringSubtypeTest.java | 7 +-
.../org/apache/uima/cas_data/impl/CasComparer.java | 179 ++++--
.../uima/cas_data/impl/CasComparerViewChange.java | 134 +---
.../apache/uima/internal/util/IntVectorTest.java | 15 +
.../uima/internal/util/MultiThreadUtils.java | 118 ++++
.../uima/internal/util/ResourcePoolTest.java | 42 +-
.../uima/internal/util/UIMAClassLoaderTest.java | 18 +-
.../uima/jcas/impl/JCasHashMapCompareTest.java | 197 ++++++
.../org/apache/uima/jcas/impl/JCasHashMapTest.java | 432 +++++++++++++
.../java/org/apache/uima/jcas/test/JCasTest.java | 17 +-
.../resource/impl/ResourceManager_implTest.java | 4 +
.../metadata/impl/MetaDataObject_implTest.java | 50 +-
.../resource/metadata/impl/TestFruitBagObject.java | 33 +-
.../resource/metadata/impl/TestFruitObject.java | 39 ++
.../org/apache/uima/util/CasToInlineXmlTest.java | 77 ++-
uimaj-cpe/checkpoint.dat.prev | Bin 971 -> 1274 bytes
uimaj-cpe/pom.xml | 8 +-
.../uima/collection/impl/cpm/PearCasPoolTest.java | 1 +
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 | 3 +-
uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF | 30 +-
uimaj-ep-cas-editor-ide/pom.xml | 13 +-
uimaj-ep-cas-editor/META-INF/MANIFEST.MF | 44 +-
uimaj-ep-cas-editor/pom.xml | 13 +-
.../uima/caseditor/editor/AnnotationEditor.java | 32 +-
.../uima/caseditor/editor/DocumentUimaImpl.java | 25 +-
uimaj-ep-configurator/META-INF/MANIFEST.MF | 26 +-
uimaj-ep-configurator/pom.xml | 8 +-
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 | 162 ++---
uimaj-ep-runtime/pom.xml | 8 +-
uimaj-examples/pom.xml | 8 +-
uimaj-parent/pom.xml | 43 +-
uimaj-test-util/pom.xml | 8 +-
uimaj-tools/pom.xml | 8 +-
.../java/org/apache/uima/tools/jcasgen/Jg.java | 41 +-
158 files changed, 5427 insertions(+), 2389 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