[uimaj] branch master updated (10c3fab -> 598a652)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 18 09:11:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository uimaj.
from 10c3fab New upstream release (2.8.1)
new fc637ef Standards-Version updated to 3.9.8
new 5f1db78 Switch to debhelper level 10
new fd8a9df Use secure Vcs-* URLs
new 81567c2 Build with the DH sequencer instead of CDBS
new 2326e57 Removed the unused build dependency on ant
adds 0aef507 New upstream version 2.9.0
new e06e7ce Merge tag 'upstream/2.9.0'
new 89ac96b Refreshed the patches
new f6ae993 No longer build Java 5 compatible bytecode
new 598a652 Upload to unstable
The 9 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 | 36 +-
PearPackagingMavenPlugin/pom.xml | 8 +-
README | 2 +-
RELEASE_NOTES.html | 43 +-
aggregate-uimaj-docbooks/pom.xml | 8 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 8 +-
aggregate-uimaj/pom.xml | 8 +-
debian/changelog | 14 +
debian/clean | 1 +
debian/compat | 2 +-
debian/control | 13 +-
debian/maven.properties | 3 -
debian/patches/build-helper-version.diff | 2 +-
debian/patches/maven-plugin-configuration.diff | 2 +-
debian/rules | 40 +-
issuesFixed/jira-report.html | 158 ++++-
jVinci/pom.xml | 8 +-
.../main/java/org/apache/vinci/debug/Debug.java | 4 +
.../org/apache/vinci/transport/BaseClient.java | 94 ++-
.../org/apache/vinci/transport/BaseServer.java | 11 +
.../apache/vinci/transport/BaseServerRunnable.java | 3 +
.../java/org/apache/vinci/transport/Frame.java | 13 +-
.../org/apache/vinci/transport/FrameComponent.java | 1 +
.../java/org/apache/vinci/transport/FrameLeaf.java | 19 +
.../apache/vinci/transport/FrameTransporter.java | 6 +-
.../org/apache/vinci/transport/KeyValuePair.java | 4 +
.../apache/vinci/transport/PooledVinciClient.java | 27 +
.../vinci/transport/SimpleTransportable.java | 1 +
.../org/apache/vinci/transport/Transportable.java | 5 +-
.../vinci/transport/TransportableFactory.java | 2 +-
.../org/apache/vinci/transport/VinciClient.java | 87 ++-
.../org/apache/vinci/transport/VinciFrame.java | 32 +
.../org/apache/vinci/transport/VinciServer.java | 33 +
.../apache/vinci/transport/XTalkTransporter.java | 9 +-
.../vinci/transport/context/VinciContext.java | 71 ++-
.../apache/vinci/transport/document/AFrame.java | 31 +
.../vinci/transport/document/XMLToVinci.java | 13 +-
.../vinci/transport/document/XMLToXTalk.java | 6 +
.../vinci/transport/document/XTalkToSAX.java | 4 +
.../vinci/transport/util/Base64Converter.java | 28 +-
.../vinci/transport/util/StreamMaterializer.java | 4 +-
.../transport/util/TransportableConverter.java | 2 +-
.../apache/vinci/transport/util/UTFConverter.java | 4 +-
.../apache/vinci/transport/util/XMLConverter.java | 18 +-
.../vinci/transport/vns/client/ResolveResult.java | 15 +-
.../vinci/transport/vns/client/ServeonResult.java | 13 +
.../vinci/transport/vns/client/VNSConfig.java | 4 +
jcasgen-maven-plugin/pom.xml | 2 +-
.../uima/tools/jcasgen/maven/JCasGenMojo.java | 10 +-
.../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 11 +
.../resources/{simple => invalidFeature}/pom.xml | 0
.../type/TypeSystem.xml} | 8 +-
pom.xml | 10 +-
uima-docbook-overview-and-setup/pom.xml | 8 +-
uima-docbook-references/pom.xml | 8 +-
uima-docbook-references/src/docbook/ref.cas.xml | 30 +-
.../src/docbook/ref.compress.xml | 18 +-
.../src/docbook/ref.xml.component_descriptor.xml | 82 ++-
uima-docbook-tools/pom.xml | 8 +-
uima-docbook-tutorials-and-users-guides/pom.xml | 8 +-
.../docbook/annotator_analysis_engine_guide.xml | 8 +-
.../src/docbook/tug.application.xml | 219 ++++++-
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 | 23 +-
.../apache/uima/InternationalizedException.java | 51 +-
.../org/apache/uima/ResourceSpecifierFactory.java | 8 +
.../src/main/java/org/apache/uima/UimaContext.java | 38 ++
.../java/org/apache/uima/UimaContextHolder.java | 62 ++
.../asb/impl/FlowControllerContainer.java | 46 +-
.../impl/PrimitiveAnalysisEngine_impl.java | 31 +-
.../src/main/java/org/apache/uima/cas/CAS.java | 2 +-
.../java/org/apache/uima/cas/CASException.java | 3 +-
.../org/apache/uima/cas/CASRuntimeException.java | 17 +-
.../java/org/apache/uima/cas/SerialFormat.java | 92 ++-
.../apache/uima/cas/impl/AnnotationIndexImpl.java | 2 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 74 ++-
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 201 ++++--
.../java/org/apache/uima/cas/impl/CASImpl.java | 485 ++++++++++----
.../java/org/apache/uima/cas/impl/CASMetadata.java | 6 +
.../org/apache/uima/cas/impl/CASMgrSerializer.java | 8 +-
.../org/apache/uima/cas/impl/CASSerializer.java | 76 ++-
.../apache/uima/cas/impl/CasSerializerSupport.java | 8 +-
.../org/apache/uima/cas/impl/CommonSerDes.java | 253 ++++++++
.../java/org/apache/uima/cas/impl/FSIndexFlat.java | 2 +-
.../uima/cas/impl/FSIndexRepositoryImpl.java | 5 +
.../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +-
.../org/apache/uima/cas/impl/Serialization.java | 38 +-
.../java/org/apache/uima/cas/impl/Subiterator.java | 39 +-
.../org/apache/uima/cas/impl/TypeSystem2Xml.java | 3 +-
.../org/apache/uima/cas/impl/TypeSystemImpl.java | 51 +-
.../org/apache/uima/cas/impl/XCASDeserializer.java | 11 +-
.../apache/uima/cas/impl/XmiCasDeserializer.java | 101 ++-
.../org/apache/uima/cas/text/AnnotationIndex.java | 109 +++-
.../uima/flow/impl/FlowControllerContext_impl.java | 3 +-
.../uima/impl/ResourceSpecifierFactory_impl.java | 8 +
.../org/apache/uima/impl/UimaContext_ImplBase.java | 54 +-
.../org/apache/uima/internal/util/I18nUtil.java | 19 +-
.../apache/uima/internal/util/Int2IntHashMap.java | 2 +-
.../org/apache/uima/internal/util/MiscImpl.java | 101 +++
.../internal/util/MsgLocalizationClassLoader.java | 27 +-
.../org/apache/uima/jcas/impl/JCasHashMap.java | 2 +-
.../java/org/apache/uima/jcas/impl/JCasImpl.java | 103 ++-
.../resource/ResourceConfigurationException.java | 10 +
.../org/apache/uima/resource/ResourceManager.java | 3 +
.../apache/uima/resource/Resource_ImplBase.java | 2 +-
.../apache/uima/resource/impl/CasManager_impl.java | 3 +-
.../resource/impl/ConfigurationManager_impl.java | 150 ++---
.../uima/resource/impl/ResourceManager_impl.java | 10 +
.../metadata/impl/FsIndexCollection_impl.java | 12 +-
.../uima/resource/metadata/impl/Import_impl.java | 9 +-
.../metadata/impl/TypePriorities_impl.java | 12 +-
.../metadata/impl/TypeSystemDescription_impl.java | 13 +-
.../main/java/org/apache/uima/util/CasCopier.java | 9 +-
.../main/java/org/apache/uima/util/CasIOUtils.java | 540 ++++++++++++++++
.../java/org/apache/uima/util/CasLoadMode.java | 98 +++
.../src/main/java/org/apache/uima/util/Misc.java | 1 +
.../main/java/org/apache/uima/util/Settings.java | 23 +-
.../org/apache/uima/util/XmlCasDeserializer.java | 34 +-
.../org/apache/uima/util/XmlCasSerializer.java | 6 +-
.../org/apache/uima/util/impl/Settings_impl.java | 121 +++-
.../org/apache/uima/util/impl/XMLParser_impl.java | 4 +
.../apache/uima/UIMAException_Messages.properties | 17 +-
.../apache/uima/cas/admin/admin_errors.properties | 2 +-
.../org/apache/uima/cas/impl/annot_impl.properties | 2 +-
.../uima/cas/impl/ll_runtimeException.properties | 4 +-
.../org/apache/uima/impl/factoryConfig.xml | 6 +-
.../org/apache/uima/impl/log_messages.properties | 4 +
.../org/apache/uima/pear/pear_messages.properties | 4 +-
uimaj-core/src/test/java/aa/Root.java | 700 +++++++++++----------
uimaj-core/src/test/java/aa/Root_Type.java | 655 ++++++++++++-------
.../impl/AnalysisEngine_implTest.java | 76 ++-
.../MultiprocessingAnalysisEngine_implTest.java | 19 +-
.../uima/analysis_engine/impl/TestAnnotator2.java | 78 ++-
.../apache/uima/cas/impl/XCASDeserializerTest.java | 6 +-
.../uima/cas/impl/XmiCasDeserializerTest.java | 18 +-
.../uima/cas/test/AnnotationIteratorTest.java | 13 +-
.../uima/cas/test/CompleteSerializationTest.java | 2 +-
.../apache/uima/cas/test/FeatureStructureTest.java | 13 +
.../apache/uima/cas/test/GrowingTheCasTest.java | 30 +-
.../apache/uima/cas/test/IndexRepositoryTest.java | 98 ++-
.../uima/cas/test/SerializationReinitTest.java | 333 ++++++----
.../uima/internal/util/Int2IntHashMapTest.java | 16 +
.../org/apache/uima/jcas/test/CASTestSetup.java | 8 +
.../java/org/apache/uima/jcas/test/JCasTest.java | 18 +
.../java/org/apache/uima/jcas/test/generatedx.xml | 152 ++---
.../java/org/apache/uima/util/CasCopierTest.java | 17 +-
.../java/org/apache/uima/util/CasIOUtilsTest.java | 269 ++++++++
.../apache/uima/util/UimaContextHolderTest.java | 68 ++
...TypeSystem.xml => testTypeSystem_variation.xml} | 6 +-
...verrides.xml => AggregateForMultipleAeTest.xml} | 8 +-
.../AnnotatorWithExternalOverrides.xml | 1 +
...ntainingCppAnnotator.xml => MultipleAeTest.xml} | 45 +-
...tainingCppAnnotator.xml => MultipleAeTest2.xml} | 35 +-
...tainingCppAnnotator.xml => MultipleAeTest3.xml} | 45 +-
.../TextAnalysisEngineImplTest/MultipleAeTest4.xml | 97 +++
.../testExternalOverride.settings | 1 +
.../testExternalOverride2.settings | 1 +
.../impl/ImportsTypeSystemImportedByName.xml} | 65 +-
...tedByName.xml => TypeSystemImportedByName2.xml} | 120 ++--
uimaj-cpe/checkpoint.dat | Bin 1361 -> 1361 bytes
uimaj-cpe/{checkpoint.dat => checkpoint.dat.prev} | Bin 1361 -> 1368 bytes
uimaj-cpe/pom.xml | 8 +-
.../collection/impl/cpm/container/CPEFactory.java | 13 +-
.../CasObjectNetworkCasProcessorImpl.java | 10 +-
.../CasProcessorConfigurationJAXBImpl.java | 11 +-
.../cpm/container/NetworkCasProcessorImpl.java | 2 +-
.../cpm/container/ProcessingContainer_Impl.java | 7 +-
.../deployer/socket/ProcessControllerAdapter.java | 6 +-
.../container/deployer/socket/SocketTransport.java | 13 +-
.../deployer/vinci/VinciCasProcessorDeployer.java | 28 +-
.../collection/impl/cpm/engine/ProcessingUnit.java | 2 +
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 | 19 +-
uimaj-eclipse-feature-tools/pom.xml | 8 +-
.../src/main/resources/feature.xml | 1 -
uimaj-eclipse-update-site/pom.xml | 2 +-
uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF | 57 +-
uimaj-ep-cas-editor-ide/pom.xml | 8 +-
.../caseditor/ide/DefaultCasDocumentProvider.java | 36 +-
.../wizards/DocumentImportStructureProvider.java | 136 ++--
.../ide/wizards/ImportDocumentWizardPage.java | 17 +-
uimaj-ep-cas-editor/META-INF/MANIFEST.MF | 116 ++--
uimaj-ep-cas-editor/plugin.xml | 2 +-
uimaj-ep-cas-editor/pom.xml | 16 +-
.../uima/caseditor/editor/DocumentFormat.java | 28 -
.../uima/caseditor/editor/DocumentUimaImpl.java | 209 +++---
uimaj-ep-configurator/META-INF/MANIFEST.MF | 53 +-
uimaj-ep-configurator/pom.xml | 24 +-
.../taeconfigurator/TAEConfiguratorPlugin.java | 62 +-
.../taeconfigurator/editors/MultiPageEditor.java | 8 +-
.../editors/ui/AbstractSectionParm.java | 10 +-
.../taeconfigurator/editors/ui/HeaderPage.java | 4 +-
.../editors/ui/HeaderPageWithSash.java | 9 +-
.../editors/ui/dialogs/AbstractDialog.java | 4 +-
.../uima/taeconfigurator/model/AllTypes.java | 1 -
.../wizards/AbstractNewWizardPage.java | 2 +-
uimaj-ep-debug/META-INF/MANIFEST.MF | 10 +-
uimaj-ep-debug/pom.xml | 14 +-
uimaj-ep-jcasgen/META-INF/MANIFEST.MF | 19 +-
uimaj-ep-jcasgen/pom.xml | 22 +-
.../uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java | 2 +-
.../org/apache/uima/jcas/jcasgenp/JgPlugin.java | 5 +-
uimaj-ep-launcher/META-INF/MANIFEST.MF | 17 +-
uimaj-ep-launcher/pom.xml | 9 +-
uimaj-ep-pear-packager/META-INF/MANIFEST.MF | 16 +-
uimaj-ep-pear-packager/pom.xml | 8 +-
.../apache/uima/pear/generate/messages.properties | 2 +-
uimaj-ep-runtime/META-INF/MANIFEST.MF | 140 ++---
uimaj-ep-runtime/pom.xml | 8 +-
uimaj-examples/pom.xml | 8 +-
.../uima/examples/SourceDocumentInformation.java | 466 +++++++-------
.../examples/SourceDocumentInformation_Type.java | 402 ++++++------
.../apache/uima/examples/cas/RegExAnnotator.java | 2 +-
.../cpe/PersonTitleDBWriterCasConsumer.java | 2 +-
.../ExampleCasMultiplierMessages.properties | 2 +-
.../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 +-
.../src/org/apache/uima/util/jet/JetExpander.java | 2 +-
uimaj-json/pom.xml | 8 +-
.../org/apache/uima/json/JsonCasSerializer.java | 1 +
.../apache/uima/json/JsonCasSerializerTest.java | 2 +
.../apache/uima/json/JsonXmiCasSerializerTest.java | 1 +
.../CasSerialization/desc/nameSpaceNeeded.xml | 7 +-
.../expected/json/nameSpaceCollision.txt | 2 +-
.../expected/json/nameSpaceCollision2.txt | 2 +-
.../expected/json/nameSpaceCollision2Omits.txt | 2 +-
.../expected/json/nameSpaceCollision2pp.txt | 13 +-
.../expected/json/nameSpaceCollision2ppOmits.txt | 13 +-
.../expected/json/nameSpaceCollisionOmits.txt | 2 +-
.../expected/json/nameSpaceCollsionFiltered.txt | 2 +-
.../expected/xmi/nameSpaceCollision.xml | 2 +-
.../expected/xmi/nameSpaceCollision2.xml | 2 +-
.../expected/xmi/nameSpaceCollision2Omits.xml | 2 +-
.../expected/xmi/nameSpaceCollision2pp.xml | 8 +-
.../expected/xmi/nameSpaceCollision2ppOmits.xml | 8 +-
.../expected/xmi/nameSpaceCollisionOmits.xml | 2 +-
.../expected/xmi/nameSpaceCollsionFiltered.xml | 2 +-
uimaj-parent/pom.xml | 191 +++++-
uimaj-test-util/pom.xml | 8 +-
uimaj-tools/pom.xml | 8 +-
.../org/apache/uima/tools/ValidateDescriptor.java | 2 -
.../uima/tools/jcasgen/JCas_TypeTemplate.java | 18 +-
.../uima/tools/viewer/CasAnnotationViewer.java | 12 +-
.../javajet/jcasgen/templates/JCas_Type.javajet | 24 -
258 files changed, 7458 insertions(+), 3118 deletions(-)
create mode 100644 debian/clean
copy jcasgen-maven-plugin/src/test/resources/{simple => invalidFeature}/pom.xml (100%)
copy jcasgen-maven-plugin/src/test/resources/{classpath/src/main/resources/type/Token.xml => invalidFeature/type/TypeSystem.xml} (87%)
create mode 100644 uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java
create mode 100644 uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java
create mode 100644 uimaj-core/src/main/java/org/apache/uima/internal/util/MiscImpl.java
create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
create mode 100644 uimaj-core/src/main/java/org/apache/uima/util/CasLoadMode.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/UimaContextHolderTest.java
copy uimaj-core/src/test/resources/ExampleCas/{testTypeSystem.xml => testTypeSystem_variation.xml} (96%)
copy uimaj-core/src/test/resources/TextAnalysisEngineImplTest/{AggregateWithExternalOverrides.xml => AggregateForMultipleAeTest.xml} (88%)
copy uimaj-core/src/test/resources/TextAnalysisEngineImplTest/{TestAggregateContainingCppAnnotator.xml => MultipleAeTest.xml} (60%)
copy uimaj-core/src/test/resources/TextAnalysisEngineImplTest/{TestAggregateContainingCppAnnotator.xml => MultipleAeTest2.xml} (67%)
copy uimaj-core/src/test/resources/TextAnalysisEngineImplTest/{TestAggregateContainingCppAnnotator.xml => MultipleAeTest3.xml} (60%)
create mode 100644 uimaj-core/src/test/resources/TextAnalysisEngineImplTest/MultipleAeTest4.xml
copy uimaj-core/src/test/resources/{CasCreationUtilsTest/SupertypeMergeTest1.xml => org/apache/uima/resource/metadata/impl/ImportsTypeSystemImportedByName.xml} (75%)
copy uimaj-core/src/test/resources/org/apache/uima/resource/metadata/impl/{TypeSystemImportedByName.xml => TypeSystemImportedByName2.xml} (96%)
copy uimaj-cpe/{checkpoint.dat => checkpoint.dat.prev} (66%)
delete mode 100644 uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentFormat.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