From 7ded42c14e3befb740c058c3d55132e6a08869f8 Mon Sep 17 00:00:00 2001 From: Juan Hernandez Date: Mar 12 2012 16:58:15 +0000 Subject: First import after review (#796204) --- diff --git a/.gitignore b/.gitignore index e69de29..ad324cd 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/maven-jaxb2-plugin-0.8.1.tar.gz diff --git a/maven-jaxb2-plugin-adapt-for-maven-3.patch b/maven-jaxb2-plugin-adapt-for-maven-3.patch new file mode 100644 index 0000000..7c3373f --- /dev/null +++ b/maven-jaxb2-plugin-adapt-for-maven-3.patch @@ -0,0 +1,58 @@ +From 8278b03b66689243957cc5aa09562c694a12ab0a Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Mon, 20 Feb 2012 20:17:17 +0100 +Subject: [PATCH 3/3] Adapt for Maven 3 + +--- + plugin-core/pom.xml | 4 ++++ + .../org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java | 2 +- + pom.xml | 5 +++++ + 3 files changed, 10 insertions(+), 1 deletions(-) + +diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml +index 98664cd..f7def2f 100644 +--- a/plugin-core/pom.xml ++++ b/plugin-core/pom.xml +@@ -19,6 +19,10 @@ + + + org.apache.maven ++ maven-compat ++ ++ ++ org.apache.maven + maven-plugin-api + + +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +index 7dfeae6..695630f 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java +@@ -926,7 +926,7 @@ public abstract class AbstractXJC2Mojo extends AbstractMojo implements + @SuppressWarnings("unchecked") + final Set artifacts = MavenMetadataSource + .createArtifacts(getArtifactFactory(), +- Arrays.asList(dependencyResource), ++ Arrays.asList((Dependency) dependencyResource), + Artifact.SCOPE_RUNTIME, null, getProject()); + + if (artifacts.size() != 1) { +diff --git a/pom.xml b/pom.xml +index d64f0e7..eb6e873 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -146,6 +146,11 @@ + + + org.apache.maven ++ maven-compat ++ ${maven.version} ++ ++ ++ org.apache.maven + maven-project + ${maven.version} + +-- +1.7.9 + diff --git a/maven-jaxb2-plugin-add-codemodel-dependency.patch b/maven-jaxb2-plugin-add-codemodel-dependency.patch new file mode 100644 index 0000000..488d0e8 --- /dev/null +++ b/maven-jaxb2-plugin-add-codemodel-dependency.patch @@ -0,0 +1,28 @@ +From 242f2b47a679a29204bc9e2c4dd29dfc91fb3314 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Tue, 21 Feb 2012 20:33:03 +0100 +Subject: [PATCH 4/4] Add codemodel dependency + +--- + plugin-2.2/pom.xml | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/plugin-2.2/pom.xml b/plugin-2.2/pom.xml +index 56757fc..d5e7301 100644 +--- a/plugin-2.2/pom.xml ++++ b/plugin-2.2/pom.xml +@@ -37,6 +37,11 @@ + maven-plugin-testing-harness + test + ++ ++ com.sun.codemodel ++ codemodel ++ 2.6 ++ + + + +-- +1.7.9 + diff --git a/maven-jaxb2-plugin-build-2.2-only.patch b/maven-jaxb2-plugin-build-2.2-only.patch new file mode 100644 index 0000000..0696739 --- /dev/null +++ b/maven-jaxb2-plugin-build-2.2-only.patch @@ -0,0 +1,35 @@ +From c853f16bad564b46c51e714301362a75d80eec75 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Mon, 20 Feb 2012 20:13:34 +0100 +Subject: [PATCH 2/2] Build version 2.2 only + +--- + pom.xml | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 8d59035..d64f0e7 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -54,11 +54,7 @@ + + + plugin-core +- plugin-2.0 +- plugin-2.1 + plugin-2.2 +- plugin +- testing + + + 2.0.6 +@@ -241,4 +237,4 @@ + + + +- +\ No newline at end of file ++ +-- +1.7.9 + diff --git a/maven-jaxb2-plugin-dont-use-internal-resolver.patch b/maven-jaxb2-plugin-dont-use-internal-resolver.patch new file mode 100644 index 0000000..1c851cb --- /dev/null +++ b/maven-jaxb2-plugin-dont-use-internal-resolver.patch @@ -0,0 +1,107 @@ +From 9b92aa7b4a55c8cdc84405125429aab85165afe2 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Mon, 20 Feb 2012 19:43:14 +0100 +Subject: [PATCH 1/2] Don't use internal resolver + +--- + .../java/org/jvnet/mjiip/v_2_2/OptionsFactory.java | 4 ++-- + plugin-core/pom.xml | 6 +++--- + .../jvnet/jaxb2/maven2/OptionsConfiguration.java | 2 +- + .../java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java | 4 ++-- + .../resolver/tools/ClasspathCatalogResolver.java | 2 +- + .../resolver/tools/MavenCatalogResolver.java | 4 ++-- + 6 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +index 778458f..b72a2e3 100644 +--- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ++++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +@@ -12,8 +12,8 @@ import org.jvnet.jaxb2.maven2.OptionsConfiguration; + import org.jvnet.jaxb2.maven2.util.StringUtils; + import org.xml.sax.InputSource; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + import com.sun.tools.xjc.BadCommandLineException; + import com.sun.tools.xjc.Language; + import com.sun.tools.xjc.Options; +diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml +index d8729eb..98664cd 100644 +--- a/plugin-core/pom.xml ++++ b/plugin-core/pom.xml +@@ -12,9 +12,9 @@ + + + +- com.sun.org.apache.xml.internal +- resolver +- 20050927 ++ xml-resolver ++ xml-resolver ++ 1.2 + + + +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java +index 6f77e03..a0b458d 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/OptionsConfiguration.java +@@ -9,7 +9,7 @@ import java.util.List; + import org.jvnet.jaxb2.maven2.util.IOUtils; + import org.xml.sax.InputSource; + +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.tools.CatalogResolver; + + public class OptionsConfiguration { + +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +index 63446ab..ff8d5e7 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java +@@ -45,8 +45,8 @@ import org.jvnet.jaxb2.maven2.util.ArtifactUtils; + import org.jvnet.jaxb2.maven2.util.CollectionUtils; + import org.jvnet.jaxb2.maven2.util.IOUtils; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + + /** + * Maven JAXB 2.x Mojo. +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +index 52ce6b2..82c8372 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java +@@ -6,7 +6,7 @@ import java.net.URL; + import java.text.MessageFormat; + + public class ClasspathCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + public static final String URI_SCHEME_CLASSPATH = "classpath"; + +diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +index a5e80f1..3d8ed45 100644 +--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java ++++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java +@@ -8,10 +8,10 @@ import java.text.MessageFormat; + import org.jvnet.jaxb2.maven2.DependencyResource; + import org.jvnet.jaxb2.maven2.DependencyResourceResolver; + +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; ++import org.apache.xml.resolver.CatalogManager; + + public class MavenCatalogResolver extends +- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver { ++ org.apache.xml.resolver.tools.CatalogResolver { + + public static final String URI_SCHEME_MAVEN = "maven"; + private final DependencyResourceResolver dependencyResourceResolver; +-- +1.7.9 + diff --git a/maven-jaxb2-plugin-remove-enconding-option.patch b/maven-jaxb2-plugin-remove-enconding-option.patch new file mode 100644 index 0000000..3fbeeb1 --- /dev/null +++ b/maven-jaxb2-plugin-remove-enconding-option.patch @@ -0,0 +1,52 @@ +From 6a6d43bd62a8ff7134642ffeb2d8bf4732634c67 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Tue, 21 Feb 2012 20:43:04 +0100 +Subject: [PATCH 5/5] Remove encoding option + +--- + .../java/org/jvnet/mjiip/v_2_2/OptionsFactory.java | 22 -------------------- + 1 files changed, 0 insertions(+), 22 deletions(-) + +diff --git a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +index b72a2e3..dc9159f 100644 +--- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java ++++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java +@@ -36,10 +36,6 @@ public class OptionsFactory implements + + options.target = SpecVersion.V2_2; + +- final String encoding = optionsConfiguration.getEncoding(); +- if (encoding != null) { +- options.encoding = createEncoding(encoding); +- } + options.setSchemaLanguage(createLanguage(optionsConfiguration + .getSchemaLanguage())); + +@@ -99,24 +95,6 @@ public class OptionsFactory implements + return options; + } + +- private String createEncoding(String encoding) +- throws MojoExecutionException { +- if (encoding == null) { +- return null; +- } +- try { +- if (!Charset.isSupported(encoding)) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- return encoding; +- } catch (IllegalCharsetNameException icne) { +- throw new MojoExecutionException(MessageFormat.format( +- "Unsupported encoding [{0}].", encoding)); +- } +- +- } +- + private Language createLanguage(String schemaLanguage) + throws MojoExecutionException { + if (StringUtils.isEmpty(schemaLanguage)) { +-- +1.7.9 + diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec new file mode 100644 index 0000000..cf88dae --- /dev/null +++ b/maven-jaxb2-plugin.spec @@ -0,0 +1,123 @@ +Name: maven-jaxb2-plugin +Version: 0.8.1 +Release: 4%{?dist} +Summary: Provides the capability to generate java sources from schemas +Group: Development/Libraries +License: BSD and ASL 2.0 +URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home + +# svn export https://svn.java.net/svn/maven-jaxb2-plugin~svn/tags/0.8.1/ maven-jaxb2-plugin-0.8.1 +# tar -zcvf maven-jaxb2-plugin-0.8.1.tar.gz maven-jaxb2-plugin-0.8.1 +Source0: %{name}-%{version}.tar.gz + +# Don't try to use an internal bundled resolver, as this is not available in +# Fedora: +Patch0: %{name}-dont-use-internal-resolver.patch + +# Build only version 2.2: +Patch1: %{name}-build-2.2-only.patch + +# Adapt for Maven 3: +Patch2: %{name}-adapt-for-maven-3.patch + +# Add dependency on codemodel: +Patch3: %{name}-add-codemodel-dependency.patch + +# Remove the enconding option as the version of the XJC compiler that we build +# in Fedora doesn't have it: +Patch4: %{name}-remove-enconding-option.patch + +BuildArch: noarch + +BuildRequires: java +BuildRequires: maven +BuildRequires: jpackage-utils +BuildRequires: xml-commons-resolver +BuildRequires: maven-surefire-provider-junit4 +BuildRequires: maven-anno-plugin +BuildRequires: glassfish-jaxb +BuildRequires: codemodel + +Requires: codemodel +Requires: glassfish-jaxb +Requires: java +Requires: maven +Requires: jpackage-utils +Requires: xml-commons-resolver + + +%description +This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability +to generate Java sources from XML Schemas. + + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + + +%description javadoc +The API documentation of %{name}. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + + +%build +mvn-rpmbuild install javadoc:aggregate + + +%install + +# Jar files: +install -d -m 755 %{buildroot}%{_javadir} +install -Dpm 644 plugin-2.2/target/maven-jaxb22-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -Dpm 644 plugin-core/target/maven-jaxb2-plugin-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-core.jar + +# POM files: +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-project.pom +install -Dpm 644 plugin-2.2/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -Dpm 644 plugin-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-core.pom + +# Dependencies map: +%add_maven_depmap JPP-%{name}-project.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap JPP-%{name}-core.pom %{name}-core.jar + +# Javadoc files: +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/. + + +%files +%{_javadir}/* +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* + + +%files javadoc +%doc %{_javadocdir}/%{name} + + +%changelog +* Mon Mar 12 2012 Juan Hernandez 0.8.1-4 +- Fixed the license header as some files use ASL 2.0 +- Changed the URL to a more reliable one + +* Fri Mar 9 2012 Juan Hernandez 0.8.1-3 +- Added maven-surefire-provider-junit4 to the build requirements + +* Wed Feb 22 2012 Juan Hernandez 0.8.1-2 +- Cleanup of the spec file + +* Sat Jan 21 2012 Marek Goldmann 0.8.1-2 +- Initial packaging + diff --git a/sources b/sources index e69de29..ad9153f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fa17ab43a24401adc30a569c0eaf5819 maven-jaxb2-plugin-0.8.1.tar.gz