[modello] 22/24: Merge tag 'upstream/1.8.3'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 9 10:49:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository modello.
commit d0fad5f0518560416f3eebf362b0d232f3607860
Merge: 8bb9fb0 95bd6c8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 8 15:34:13 2015 +0200
Merge tag 'upstream/1.8.3'
Upstream version 1.8.3
.gitignore | 9 +-
README.md | 14 +
modello-core/pom.xml | 3 +-
.../main/java/org/codehaus/modello/Modello.java | 1 -
.../main/java/org/codehaus/modello/ModelloCli.java | 1 -
.../org/codehaus/modello/ModelloException.java | 1 -
.../modello/ModelloParameterConstants.java | 17 +-
.../codehaus/modello/ModelloRuntimeException.java | 1 -
.../codehaus/modello/core/AbstractModelloCore.java | 1 -
.../core/DefaultGeneratorPluginManager.java | 1 -
.../modello/core/DefaultMetadataPluginManager.java | 1 -
.../codehaus/modello/core/DefaultModelloCore.java | 2 -
.../modello/core/GeneratorPluginManager.java | 1 -
.../modello/core/MetadataPluginManager.java | 1 -
.../org/codehaus/modello/core/ModelloCore.java | 1 -
.../org/codehaus/modello/core/io/ModelReader.java | 3 +-
.../modello/metadata/AbstractMetadataPlugin.java | 1 -
.../modello/metadata/AssociationMetadata.java | 1 -
.../codehaus/modello/metadata/ClassMetadata.java | 1 -
.../codehaus/modello/metadata/FieldMetadata.java | 1 -
.../modello/metadata/InterfaceMetadata.java | 1 -
.../org/codehaus/modello/metadata/Metadata.java | 1 -
.../codehaus/modello/metadata/MetadataPlugin.java | 1 -
.../codehaus/modello/metadata/ModelMetadata.java | 1 -
.../org/codehaus/modello/model/BaseElement.java | 1 -
.../org/codehaus/modello/model/CodeSegment.java | 1 -
.../java/org/codehaus/modello/model/Model.java | 48 +-
.../codehaus/modello/model/ModelAssociation.java | 1 -
.../org/codehaus/modello/model/ModelClass.java | 2 -
.../org/codehaus/modello/model/ModelDefault.java | 4 +-
.../org/codehaus/modello/model/ModelField.java | 13 +-
.../org/codehaus/modello/model/ModelInterface.java | 2 -
.../java/org/codehaus/modello/model/ModelType.java | 2 -
.../modello/model/ModelValidationException.java | 1 -
.../java/org/codehaus/modello/model/Version.java | 1 -
.../codehaus/modello/model/VersionDefinition.java | 27 +
.../org/codehaus/modello/model/VersionRange.java | 1 -
.../org/codehaus/modello/model/VersionUtil.java | 4 -
.../modello/plugin/AbstractModelloGenerator.java | 13 +-
.../modello/plugin/AbstractPluginManager.java | 1 -
.../codehaus/modello/plugin/ModelloGenerator.java | 1 -
.../plugin/model/ModelAssociationMetadata.java | 1 -
.../modello/plugin/model/ModelClassMetadata.java | 1 -
.../modello/plugin/model/ModelFieldMetadata.java | 1 -
.../plugin/model/ModelInterfaceMetadata.java | 1 -
.../modello/plugin/model/ModelMetadataPlugin.java | 1 -
.../modello/plugin/model/ModelModelMetadata.java | 1 -
modello-core/src/site/site.xml | 14 +-
.../modello/core/DefaultModelloCoreTest.java | 1 -
.../codehaus/modello/core/io/ModelReaderTest.java | 2 -
.../modello/model/VersionDefinitionTest.java | 34 +
.../org/codehaus/modello/model/VersionTest.java | 1 -
modello-plugins/modello-plugin-converters/pom.xml | 2 +-
.../plugin/converters/ConverterGenerator.java | 26 +-
.../modello-plugin-converters/src/site/site.xml | 14 +-
.../plugin/converters/ConverterGeneratorTest.java | 1 -
modello-plugins/modello-plugin-dom4j/pom.xml | 2 +-
.../modello/plugin/dom4j/Dom4jReaderGenerator.java | 12 +-
.../modello-plugin-dom4j/src/site/site.xml | 14 +-
.../modello-plugin-dom4j/src/site/xdoc/index.xml | 6 +-
.../modello/plugin/dom4j/Dom4jGeneratorTest.java | 2 +-
.../plugin/dom4j/FeaturesDom4jGeneratorTest.java | 1 -
.../src/test/verifiers/dom4j/Dom4jVerifier.java | 5 +-
.../verifiers/features/Dom4jFeaturesVerifier.java | 24 +-
.../pom.xml | 49 +-
.../plugin/jackson/AbstractJacksonGenerator.java} | 9 +-
.../jackson/JacksonExtendedReaderGenerator.java | 34 +-
.../plugin/jackson/JacksonReaderGenerator.java | 1015 +++++++++++
.../plugin/jackson/JacksonWriterGenerator.java | 409 +++++
.../main/resources/META-INF/plexus/components.xml | 16 +
.../modello-plugin-jackson/src/site/site.xml | 22 +
.../modello-plugin-jackson/src/site/xdoc/index.xml | 56 +
.../plugin/jackson/JacksonGeneratorTest.java} | 46 +-
.../src/test/resources/maven.mdo | 1784 ++++++++++++++++++++
.../test/verifiers/jackson/JacksonVerifier.java} | 224 +--
.../src/test/verifiers/jackson/expected.json | 67 +
modello-plugins/modello-plugin-java/pom.xml | 2 +-
.../plugin/java/AbstractJavaModelloGenerator.java | 48 +-
.../modello/plugin/java/JavaModelloGenerator.java | 820 ++++++++-
.../plugin/java/javasource/JAnnotations.java | 6 +-
.../modello/plugin/java/javasource/JArrayType.java | 2 +-
.../modello/plugin/java/javasource/JClass.java | 23 +-
.../plugin/java/javasource/JCollectionType.java | 2 +-
.../modello/plugin/java/javasource/JComment.java | 4 +-
.../modello/plugin/java/javasource/JCompUnit.java | 17 +-
.../plugin/java/javasource/JComponentizedType.java | 2 +-
.../plugin/java/javasource/JConstructor.java | 4 +-
.../plugin/java/javasource/JDocComment.java | 4 +-
.../plugin/java/javasource/JDocDescriptor.java | 4 +-
.../modello/plugin/java/javasource/JField.java | 4 +-
.../modello/plugin/java/javasource/JInterface.java | 10 +-
.../modello/plugin/java/javasource/JMapType.java | 129 ++
.../modello/plugin/java/javasource/JMember.java | 4 +-
.../modello/plugin/java/javasource/JMethod.java | 4 +-
.../plugin/java/javasource/JMethodSignature.java | 3 +-
.../modello/plugin/java/javasource/JModifiers.java | 4 +-
.../modello/plugin/java/javasource/JNamedMap.java | 2 +-
.../modello/plugin/java/javasource/JNaming.java | 11 +-
.../modello/plugin/java/javasource/JParameter.java | 4 +-
.../plugin/java/javasource/JSourceCode.java | 4 +-
.../plugin/java/javasource/JSourceWriter.java | 4 +-
.../modello/plugin/java/javasource/JStructure.java | 4 +-
.../modello/plugin/java/javasource/JType.java | 4 +-
.../java/metadata/JavaAssociationMetadata.java | 5 +-
.../plugin/java/metadata/JavaClassMetadata.java | 48 +-
.../plugin/java/metadata/JavaFieldMetadata.java | 1 -
.../java/metadata/JavaInterfaceMetadata.java | 1 -
.../plugin/java/metadata/JavaMetadataPlugin.java | 22 +-
.../plugin/java/metadata/JavaModelMetadata.java | 1 -
.../modello-plugin-java/src/site/site.xml | 22 +
.../plugin/java/AbstractAnnotationsVerifier.java | 1 -
.../modello/plugin/java/AbstractPrincipal.java | 1 -
.../plugin/java/AnnotationsJava4GeneratorTest.java | 2 -
.../plugin/java/AssociationGeneratorTest.java | 1 -
.../BiDirectionalOverrideJavaGeneratorTest.java | 1 -
...atorTest.java => BuilderJavaGeneratorTest.java} | 41 +-
.../plugin/java/FeaturesJava5GeneratorTest.java | 1 -
.../plugin/java/FeaturesJavaGeneratorTest.java | 1 -
.../java/FeaturesVersionJavaGeneratorTest.java | 5 +-
.../modello/plugin/java/JavaGeneratorTest.java | 1 -
.../plugin/java/LocationsJavaGeneratorTest.java | 1 -
.../plugin/java/PackageVersionJavaTest.java | 1 -
.../codehaus/modello/plugin/java/Permission.java | 1 -
.../org/codehaus/modello/plugin/java/Role.java | 1 -
...st.java => StaticCreatorJavaGeneratorTest.java} | 29 +-
.../modello/plugin/java/TmpJavaGeneratorTest.java | 1 -
...torTest.java => ToStringJavaGeneratorTest.java} | 25 +-
.../plugin/java/javasource/JMapTypeTestCase.java | 55 +
.../src/test/resources/models/builder.mdo | 105 ++
.../src/test/resources/models/static-creator.mdo | 69 +
.../src/test/resources/models/tostring.mdo | 31 +
.../verifiers/annotations/AnnotationsVerifier.java | 1 -
.../verifiers/features-version/JavaVerifier.java | 1 -
.../src/test/verifiers/features/JavaVerifier.java | 19 +-
.../verifiers/locations/JavaLocationsVerifier.java | 1 -
modello-plugins/modello-plugin-jdom/pom.xml | 2 +-
.../modello/plugin/jdom/AbstractJDOMGenerator.java | 1 -
.../modello/plugin/jdom/JDOMWriterGenerator.java | 4 +-
.../modello-plugin-jdom/src/site/site.xml | 14 +-
.../modello-plugin-jdom/src/site/xdoc/index.xml | 9 +-
.../plugin/jdom/FeaturesJDOMGeneratorTest.java | 1 -
.../verifiers/features/JDOMFeaturesVerifier.java | 18 +-
.../pom.xml | 19 +-
.../plugin/jsonschema/JsonSchemaGenerator.java | 330 ++++
.../main/resources/META-INF/plexus/components.xml | 15 +
.../modello-plugin-jsonschema/src/site/site.xml | 22 +
.../pom.xml | 30 +-
.../modello/plugin/sax/SaxWriterGenerator.java | 672 ++++++++
.../main/resources/META-INF/plexus/components.xml | 10 +
.../modello-plugin-sax/src/site/site.xml | 22 +
.../modello-plugin-sax/src/site/xdoc/index.xml | 40 +
.../modello/plugin/sax/SaxGeneratorTest.java} | 25 +-
.../src/test/resources/maven.mdo | 1784 ++++++++++++++++++++
.../src/test/verifiers/sax/SaxVerifier.java} | 185 +-
.../src/test/verifiers/sax/expected.xml | 71 +
.../pom.xml | 28 +-
.../snakeyaml/AbstractSnakeYamlGenerator.java} | 9 +-
.../SnakeYamlExtendedReaderGenerator.java | 34 +-
.../plugin/snakeyaml/SnakeYamlReaderGenerator.java | 1243 ++++++++++++++
.../snakeyaml/SnakeYamlWriterGenerator.java} | 311 ++--
.../main/resources/META-INF/plexus/components.xml | 22 +
.../modello-plugin-snakeyaml/src/site/site.xml | 22 +
.../src/site/xdoc/index.xml | 56 +
modello-plugins/modello-plugin-stax/pom.xml | 2 +-
.../modello/plugin/stax/AbstractStaxGenerator.java | 7 +-
.../modello/plugin/stax/StaxReaderGenerator.java | 222 ++-
.../plugin/stax/StaxSerializerGenerator.java | 1 -
.../modello/plugin/stax/StaxWriterGenerator.java | 112 +-
.../modello-plugin-stax/src/site/site.xml | 14 +-
.../modello-plugin-stax/src/site/xdoc/index.xml | 10 +-
.../xml/stax/AbstractStaxGeneratorTestCase.java | 6 +-
.../xml/stax/BooleanTypeStaxGeneratorTest.java | 51 +
...Test.java => FeaturesStaxDomGeneratorTest.java} | 8 +-
.../xml/stax/FeaturesStaxGeneratorTest.java | 1 -
.../xml/stax/NoAdderStaxGeneratorTest.java | 51 +
.../generator/xml/stax/StaxGeneratorPartsTest.java | 1 -
.../generator/xml/stax/StaxGeneratorTest.java | 1 -
.../xml/stax/StaxGeneratorVersionInFieldTest.java | 1 -
.../stax/StaxGeneratorVersionInNamespaceTest.java | 1 -
.../StaxGeneratorVersionReaderDelegateTest.java | 1 -
.../StaxGeneratorWrongVersionInNamespaceTest.java | 1 -
.../xml/stax/StaxGeneratorWrongVersionTest.java | 1 -
.../src/test/resources/boolean.mdo | 27 +
.../src/test/resources/noAdder.mdo | 41 +
.../StaxFeaturesVerifier.java | 24 +-
.../verifiers/features/StaxFeaturesVerifier.java | 24 +-
.../verifiers/stax-parts/StaxVerifierParts.java | 1 -
.../StaxVerifierVersionInField.java | 1 -
.../StaxVerifierVersionInNamespace.java | 1 -
.../StaxVerifierVersionReaderDelegate.java | 1 -
.../StaxVerifierWrongVersionNamespace.java | 1 -
.../StaxVerifierWrongVersion.java | 1 -
.../src/test/verifiers/stax/StaxVerifier.java | 1 -
modello-plugins/modello-plugin-xdoc/pom.xml | 2 +-
.../modello/plugin/xdoc/XdocGenerator.java | 7 +-
.../xdoc/metadata/XdocAssociationMetadata.java | 1 -
.../plugin/xdoc/metadata/XdocClassMetadata.java | 1 -
.../plugin/xdoc/metadata/XdocFieldMetadata.java | 3 +-
.../xdoc/metadata/XdocInterfaceMetadata.java | 1 -
.../plugin/xdoc/metadata/XdocMetadataPlugin.java | 1 -
.../plugin/xdoc/metadata/XdocModelMetadata.java | 1 -
.../modello-plugin-xdoc/src/site/site.xml | 15 +-
.../modello/plugin/xdoc/XdocGeneratorTest.java | 24 +-
.../src/test/resources/settings.mdo | 1096 ++++++++++++
modello-plugins/modello-plugin-xml/pom.xml | 2 +-
.../modello/plugins/xml/AbstractXmlGenerator.java | 1 -
.../plugins/xml/AbstractXmlJavaGenerator.java | 5 +-
.../modello/plugins/xml/XmlModelHelpers.java | 8 +-
.../xml/metadata/XmlAssociationMetadata.java | 1 -
.../plugins/xml/metadata/XmlClassMetadata.java | 13 +-
.../plugins/xml/metadata/XmlFieldMetadata.java | 3 +-
.../plugins/xml/metadata/XmlInterfaceMetadata.java | 1 -
.../plugins/xml/metadata/XmlMetadataPlugin.java | 9 +-
.../plugins/xml/metadata/XmlModelMetadata.java | 1 -
.../modello-plugin-xml/src/site/site.xml | 14 +-
.../modello/plugins/xml/XmlModelloPluginTest.java | 3 +-
modello-plugins/modello-plugin-xpp3/pom.xml | 2 +-
.../modello-plugin-xpp3/src/it/maven-model/pom.xml | 2 +-
.../modello/plugin/xpp3/AbstractXpp3Generator.java | 1 -
.../modello/plugin/xpp3/Xpp3ReaderGenerator.java | 1229 +++++++-------
.../modello/plugin/xpp3/Xpp3WriterGenerator.java | 90 +-
.../modello-plugin-xpp3/src/site/site.xml | 15 +-
.../modello-plugin-xpp3/src/site/xdoc/index.xml | 8 +-
...ctElementTest.java => AbstractElementTest.java} | 7 +-
.../xml/xpp3/BooleanTypeXpp3GeneratorTest.java | 50 +
...Test.java => FeaturesXpp3DomGeneratorTest.java} | 8 +-
.../xml/xpp3/FeaturesXpp3GeneratorTest.java | 1 -
.../xml/xpp3/LocationsSourceXpp3GeneratorTest.java | 1 -
.../xml/xpp3/LocationsXpp3GeneratorTest.java | 1 -
...t.java => StandaloneReadXpp3GeneratorTest.java} | 22 +-
.../generator/xml/xpp3/Xpp3GeneratorTest.java | 1 -
.../src/test/resources/boolean.mdo | 27 +
.../src/test/resources/standaloneRead.mdo | 56 +
.../Xpp3FeaturesVerifier.java | 24 +-
.../verifiers/features/Xpp3FeaturesVerifier.java | 22 +-
.../locations+src/Xpp3LocationsSourceVerifier.java | 1 -
.../verifiers/locations/Xpp3LocationsVerifier.java | 1 -
.../Xpp3StandaloneReadVerifier.java | 101 ++
.../verifiers/testStandaloneRead/rootClass.xml | 7 +
.../testStandaloneRead/standaloneReadClass.xml | 3 +
.../src/test/verifiers/xpp3/Xpp3Verifier.java | 1 -
modello-plugins/modello-plugin-xsd/pom.xml | 2 +-
.../codehaus/modello/plugin/xsd/XsdGenerator.java | 9 +-
.../modello/plugin/xsd/XsdModelHelper.java | 1 -
.../xsd/metadata/XsdAssociationMetadata.java | 1 -
.../plugin/xsd/metadata/XsdClassMetadata.java | 1 -
.../plugin/xsd/metadata/XsdFieldMetadata.java | 1 -
.../plugin/xsd/metadata/XsdInterfaceMetadata.java | 1 -
.../plugin/xsd/metadata/XsdMetadataPlugin.java | 1 -
.../plugin/xsd/metadata/XsdModelMetadata.java | 1 -
.../modello-plugin-xsd/src/site/site.xml | 14 +-
.../plugin/xsd/ChangesXsdGeneratorTest.java | 3 +-
.../plugin/xsd/FeaturesXsdGeneratorTest.java | 5 +-
.../plugin/xsd/ModelloXsdGeneratorTest.java | 1 -
.../modello/plugin/xsd/XsdGeneratorTest.java | 3 +-
modello-plugins/pom.xml | 6 +-
modello-plugins/src/site/site.xml | 4 +-
pom.xml | 222 ++-
src/main/mdo/modello.mdo | 24 +-
src/site/apt/release-notes.apt | 109 +-
src/site/site.xml | 11 +-
261 files changed, 12735 insertions(+), 1905 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello.git
More information about the pkg-java-commits
mailing list