diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f0bd23 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/glassfish-jaxb-2.2.5.tar.gz diff --git a/.glassfish-jaxb.metadata b/.glassfish-jaxb.metadata new file mode 100644 index 0000000..8fc95a2 --- /dev/null +++ b/.glassfish-jaxb.metadata @@ -0,0 +1 @@ +a099a9adc105c34437ad2a72c6ec91d176bb5c1c SOURCES/glassfish-jaxb-2.2.5.tar.gz diff --git a/SOURCES/build-javadoc.xml b/SOURCES/build-javadoc.xml new file mode 100644 index 0000000..6411abb --- /dev/null +++ b/SOURCES/build-javadoc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/SOURCES/glassfish-jaxb-add-dependencies.patch b/SOURCES/glassfish-jaxb-add-dependencies.patch new file mode 100644 index 0000000..bfebdac --- /dev/null +++ b/SOURCES/glassfish-jaxb-add-dependencies.patch @@ -0,0 +1,114 @@ +--- a/jaxb-impl.pom ++++ b/jaxb-impl.pom +@@ -43,12 +43,6 @@ + + + +- +- net.java +- jvnet-parent +- 1 +- +- + 4.0.0 + com.sun.xml.bind + jaxb-impl +@@ -91,6 +85,37 @@ + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + ++ ++ ++ isorelax ++ isorelax ++ system ++ /usr/share/java/isorelax.jar ++ ++ ++ msv-msv ++ msv-msv ++ system ++ /usr/share/java/msv-msv.jar ++ ++ ++ relaxngDatatype ++ relaxngDatatype ++ system ++ /usr/share/java/relaxngDatatype.jar ++ ++ ++ com.sun.istack ++ istack-commons-runtime ++ 2.6.1 ++ ++ ++ com.sun.xml.txw2 ++ txw2 ++ 20110809 ++ ++ ++ + + + +--- a/jaxb-xjc.pom ++++ b/jaxb-xjc.pom +@@ -43,12 +43,6 @@ + + + +- +- net.java +- jvnet-parent +- 1 +- +- + 4.0.0 + com.sun.xml.bind + jaxb-xjc +@@ -91,6 +85,45 @@ + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + ++ ++ ++ com.sun.codemodel ++ codemodel ++ 2.6 ++ ++ ++ com.sun.xml.dtd-parser ++ dtd-parser ++ 1.2-SNAPSHOT ++ ++ ++ com.sun.istack ++ istack-commons-tools ++ 2.6.1 ++ ++ ++ relaxngDatatype ++ relaxngDatatype ++ system ++ /usr/share/java/relaxngDatatype.jar ++ ++ ++ xml-resolver ++ xml-resolver ++ 1.2 ++ ++ ++ org.kohsuke.rngom ++ rngom ++ 201103-SNAPSHOT ++ ++ ++ com.sun.xsom ++ xsom ++ 20110809 ++ ++ ++ + + + diff --git a/SOURCES/glassfish-jaxb-dont-build-examples.patch b/SOURCES/glassfish-jaxb-dont-build-examples.patch new file mode 100644 index 0000000..0c34924 --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-build-examples.patch @@ -0,0 +1,37 @@ +From bc4b149aa582d1663db86141533477a3a7ca937e Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 18:04:52 +0100 +Subject: [PATCH 7/7] Don't build examples + +--- + build.xml | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) + +diff --git a/build.xml b/build.xml +index 7b18a8e..4da31cb 100644 +--- a/build.xml ++++ b/build.xml +@@ -880,20 +880,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-dont-bundle-other-jars.patch b/SOURCES/glassfish-jaxb-dont-bundle-other-jars.patch new file mode 100644 index 0000000..3a862f7 --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-bundle-other-jars.patch @@ -0,0 +1,44 @@ +From a954f6d671b5c3f334a80e803db77362500c1e48 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:20:13 +0100 +Subject: [PATCH 4/5] Don't bundle other jars + +--- + build.xml | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/build.xml b/build.xml +index 12631a1..4dda9ef 100644 +--- a/build.xml ++++ b/build.xml +@@ -830,7 +830,6 @@ + + + +- + + + +@@ -854,19 +853,13 @@ Class-Path: ${manifest.classpath} + + + +- +- +- +- + + +- + + + +- + + + +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-dont-generate-1.0-runtime.patch b/SOURCES/glassfish-jaxb-dont-generate-1.0-runtime.patch new file mode 100644 index 0000000..81504cf --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-generate-1.0-runtime.patch @@ -0,0 +1,60 @@ +From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:11:14 +0100 +Subject: [PATCH 2/5] Don't generate 1.0 runtime + +--- + build.xml | 23 +---------------------- + 1 files changed, 1 insertions(+), 22 deletions(-) + +diff --git a/build.xml b/build.xml +index 7e95870..12631a1 100644 +--- a/build.xml ++++ b/build.xml +@@ -798,7 +798,7 @@ + + + + + +@@ -834,25 +834,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath} + + + +- +- + + + +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-dont-generate-jing-rnc-driver.patch b/SOURCES/glassfish-jaxb-dont-generate-jing-rnc-driver.patch new file mode 100644 index 0000000..17b709a --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-generate-jing-rnc-driver.patch @@ -0,0 +1,31 @@ +From 2fad64699dd922ae6c78575b4b32f621461544a5 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:16:56 +0100 +Subject: [PATCH 3/5] Don't generate Jing RNC driver + +--- + tools/build.xml | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/tools/build.xml b/tools/build.xml +index d304db4..0723987 100644 +--- a/tools/build.xml ++++ b/tools/build.xml +@@ -53,14 +53,12 @@ + + +- + + + + + + +- + + + +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-dont-use-internal-resolver.patch b/SOURCES/glassfish-jaxb-dont-use-internal-resolver.patch new file mode 100644 index 0000000..240e5c0 --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-use-internal-resolver.patch @@ -0,0 +1,27 @@ +From 5f4055b0b8792440e3f004ff189e08e05c5a1d44 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:08:06 +0100 +Subject: [PATCH 1/5] Don't use internal resolver + +--- + xjc/src/com/sun/tools/xjc/Options.java | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xjc/src/com/sun/tools/xjc/Options.java b/xjc/src/com/sun/tools/xjc/Options.java +index 78c9cf4..d8247de 100644 +--- a/xjc/src/com/sun/tools/xjc/Options.java ++++ b/xjc/src/com/sun/tools/xjc/Options.java +@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter; + import com.sun.codemodel.JPackage; + import com.sun.codemodel.writer.FileCodeWriter; + import com.sun.codemodel.writer.PrologCodeWriter; +-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.api.ClassNameAllocator; + import com.sun.tools.xjc.api.SpecVersion; + import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory; +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-dont-use-prebuilt-javadocs.patch b/SOURCES/glassfish-jaxb-dont-use-prebuilt-javadocs.patch new file mode 100644 index 0000000..f905447 --- /dev/null +++ b/SOURCES/glassfish-jaxb-dont-use-prebuilt-javadocs.patch @@ -0,0 +1,26 @@ +From 463def43292b22ba9137b79fe98a96fe545725ed Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 18:04:19 +0100 +Subject: [PATCH 6/7] Don't use prebuilt javadocs + +--- + build.xml | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/build.xml b/build.xml +index a0759eb..7b18a8e 100644 +--- a/build.xml ++++ b/build.xml +@@ -880,9 +880,6 @@ + + + +- +- +- + + + +-- +1.7.9 + diff --git a/SOURCES/glassfish-jaxb-remove-classpath-from-manifests.patch b/SOURCES/glassfish-jaxb-remove-classpath-from-manifests.patch new file mode 100644 index 0000000..8933dfc --- /dev/null +++ b/SOURCES/glassfish-jaxb-remove-classpath-from-manifests.patch @@ -0,0 +1,34 @@ +From 1bcc5546d6100f1cc41f6e1cb9be113ce967d737 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:24:00 +0100 +Subject: [PATCH 5/5] Remove classpath from manifests + +--- + build.xml | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/build.xml b/build.xml +index 4dda9ef..a0759eb 100644 +--- a/build.xml ++++ b/build.xml +@@ -820,9 +820,6 @@ + + + +- +- +- + +@@ -845,7 +842,6 @@ + + Main-Class: com.sun.tools.xjc.XJCFacade +-Class-Path: ${manifest.classpath} + + + +-- +1.7.9 + diff --git a/SOURCES/jaxb-impl-2.2.5.pom b/SOURCES/jaxb-impl-2.2.5.pom new file mode 100644 index 0000000..05d66e6 --- /dev/null +++ b/SOURCES/jaxb-impl-2.2.5.pom @@ -0,0 +1,114 @@ + + + + + + + net.java + jvnet-parent + 1 + + + 4.0.0 + com.sun.xml.bind + jaxb-impl + 2.2.5 + jar + + JAXB Reference Implementation + JAXB (JSR 222) Reference Implementation + http://jaxb.java.net/ + + + Oracle Corporation + http://www.oracle.com/ + + + + + Martin Grebac + martin.grebac@oracle.com + Oracle Corporation + + + + + + CDDL 1.1 + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + GPL2 w/ CPE + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + + + scm:svn:http://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + + + + + javax.xml.bind + jaxb-api + 2.2.6 + + + com.sun.istack + istack-commons-runtime + 2.6.1 + + + com.sun.xml.fastinfoset + FastInfoset + 1.2.12 + + + + + diff --git a/SOURCES/jaxb-xjc-2.2.5.pom b/SOURCES/jaxb-xjc-2.2.5.pom new file mode 100644 index 0000000..c2fd8aa --- /dev/null +++ b/SOURCES/jaxb-xjc-2.2.5.pom @@ -0,0 +1,104 @@ + + + + + + + net.java + jvnet-parent + 1 + + + 4.0.0 + com.sun.xml.bind + jaxb-xjc + 2.2.5 + jar + + JAXB XJC + JAXB (JSR 222) reference implementation - Schema compiler + http://jaxb.java.net/ + + + Oracle Corporation + http://www.oracle.com/ + + + + + Martin Grebac + martin.grebac@oracle.com + Oracle Corporation + + + + + + CDDL 1.1 + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + GPL2 w/ CPE + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + + + scm:svn:http://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + + + + + com.sun.xml.bind + jaxb-impl + 2.2.5 + + + + + diff --git a/SPECS/glassfish-jaxb.spec b/SPECS/glassfish-jaxb.spec new file mode 100644 index 0000000..cde91f4 --- /dev/null +++ b/SPECS/glassfish-jaxb.spec @@ -0,0 +1,236 @@ +Name: glassfish-jaxb +Version: 2.2.5 +Release: 6%{?dist} +Summary: JAXB Reference Implementation + +Group: Development/Libraries +License: CDDL and GPLv2 with exceptions +URL: http://jaxb.java.net + +# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/ glassfish-jaxb-2.2.5 +# find glassfish-jaxb-2.2.5/ -name '*.class' -delete +# find glassfish-jaxb-2.2.5/ -name '*.jar' -delete +# find glassfish-jaxb-2.2.5/ -name '*.zip' -delete +# find glassfish-jaxb-2.2.5/ -name '*.dll' -delete +# tar czf glassfish-jaxb-2.2.5.tar.gz glassfish-jaxb-2.2.5 +Source0: %{name}-%{version}.tar.gz + +# JAXB implementation POM: +Source1: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.pom + +# JAXB XJC POM: +Source2: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.2.5/jaxb-xjc-2.2.5.pom + +# Ant build file used to generate the Javadoc (this is not part of the original +# source but written on purpose for the packaging): +Source3: build-javadoc.xml + +# Use resolver from xml-commons-resolver instead of an internal rebundled one: +Patch0: %{name}-dont-use-internal-resolver.patch + +# Don't try to generate the 1.0 runtime: +Patch1: %{name}-dont-generate-1.0-runtime.patch + +# Removing Jing driver because of incompatibility issues: +Patch2: %{name}-dont-generate-jing-rnc-driver.patch + +# Don't bundle the contents of other jar files in the XJC compiler jar file: +Patch3: %{name}-dont-bundle-other-jars.patch + +# Remove the class-path entry from the generated manifest files: +Patch4: %{name}-remove-classpath-from-manifests.patch + +# Patch the POM files to include the dependencies corresponding to the jar +# files that we aren't bundling within the jat files of this package: +Patch5: %{name}-add-dependencies.patch + +# Don't use the prebuilt javadocs: +Patch6: %{name}-dont-use-prebuilt-javadocs.patch + +# Don't build the examples as they need additional dependencies: +Patch7: %{name}-dont-build-examples.patch + +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: java-devel + +BuildRequires: ant +BuildRequires: codemodel +BuildRequires: istack-commons +BuildRequires: relaxngcc +BuildRequires: xml-commons-resolver +BuildRequires: txw2 +BuildRequires: relaxngDatatype +BuildRequires: glassfish-dtd-parser +BuildRequires: glassfish-jaxb-api +BuildRequires: glassfish-fastinfoset +BuildRequires: jing +BuildRequires: stax-ex +BuildRequires: isorelax +BuildRequires: xsom +BuildRequires: rngom + +Requires: glassfish-dtd-parser +Requires: xml-commons-resolver +Requires: xsom +Requires: rngom +Requires: isorelax +Requires: jing +Requires: stax-ex +Requires: glassfish-fastinfoset +Requires: glassfish-jaxb-api +Requires: relaxngDatatype +Requires: txw2 +Requires: istack-commons +Requires: codemodel +Requires: jpackage-utils +Requires: java + + +%description +GlassFish JAXB Reference Implementation. + + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: jpackage-utils + + +%description javadoc +This package contains the API documentation for %{name}. + + +%prep + +# Unpack the sources: +%setup -q + +# Put the POM files in place (we do this before patching because we need to +# patch the POMs in order to add the dependencies for the artifacts that we are +# not bundling): +cp %{SOURCE1} jaxb-impl.pom +cp %{SOURCE2} jaxb-xjc.pom + +# Apply the patches: +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +# Link the libraries where the build script expects them: +ln -s $(build-classpath codemodel) tools/lib/rebundle/compiler/codemodel.jar +ln -s $(build-classpath glassfish-dtd-parser) tools/lib/rebundle/compiler/dtd-parser.jar +ln -s $(build-classpath istack-commons-tools) tools/lib/rebundle/compiler/istack-commons-tools.jar +ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/compiler/relaxngDatatype.jar +ln -s $(build-classpath xml-commons-resolver) tools/lib/rebundle/compiler/resolver.jar +ln -s $(build-classpath rngom) tools/lib/rebundle/compiler/rngom.jar +ln -s $(build-classpath xsom) tools/lib/rebundle/compiler/xsom.jar +ln -s $(build-classpath isorelax) tools/lib/rebundle/runtime/isorelax.jar +ln -s $(build-classpath msv-msv) tools/lib/rebundle/runtime/msv.jar +ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/runtime/relaxngDatatype.jar +ln -s $(build-classpath istack-commons-runtime) tools/lib/rebundle/runtime2/istack-commons-runtime.jar +ln -s $(build-classpath txw2) tools/lib/rebundle/runtime2/txw2.jar +ln -s $(build-classpath jaxb-api) tools/lib/redist/jaxb-api.jar +ln -s %{_javadir}/glassfish-fastinfoset/FastInfoset.jar tools/lib/util/FastInfoset.jar +ln -s $(build-classpath args4j) tools/lib/util/args4j.jar +ln -s $(build-classpath codemodel-annotation-compiler) tools/lib/util/codemodel-annotation-compiler.jar +ln -s $(build-classpath dom4j) tools/lib/util/dom4j.jar +ln -s $(build-classpath jing) tools/lib/util/jing.jar +ln -s $(build-classpath relaxngcc) tools/lib/util/relaxngcc.jar +ln -s $(build-classpath stax-ex) tools/lib/util/stax-ex.jar +ln -s $(build-classpath txwc2) tools/lib/util/txwc2.jar + +# Put the Javadoc build file in place (no patching needed here, as this is not +# part of the original source): +cp %{SOURCE3} build-javadoc.xml + + +%build + +# Build the binaries: +ant \ + -Dbuild.sysclasspath=last \ + -Dbuild.number=1 \ + dist + +# Build the javadoc for the runtime and the compiler: +ant \ + -Dbuild.sysclasspath=last \ + -f build-javadoc.xml + + +%install + +# Jar files: +install -d -m 755 %{buildroot}%{_javadir}/%{name} +install -m 644 dist/lib/jaxb-impl.jar %{buildroot}%{_javadir}/%{name}/jaxb-impl.jar +install -m 644 dist/lib/jaxb-xjc.jar %{buildroot}%{_javadir}/%{name}/jaxb-xjc.jar +install -m 644 tools/pretty-printer/build/pretty-printer.jar %{buildroot}%{_javadir}/%{name}/pretty-printer.jar +install -m 644 tools/xmllint/build/xmllint.jar %{buildroot}%{_javadir}/%{name}/xmllint.jar + +# POM files: +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 jaxb-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-impl.pom +install -m 644 jaxb-xjc.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-xjc.pom + +# Javadoc files: +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. + +# Dependencies map: +%add_maven_depmap JPP.%{name}-jaxb-impl.pom %{name}/jaxb-impl.jar +%add_maven_depmap JPP.%{name}-jaxb-xjc.pom %{name}/jaxb-xjc.jar + + +%files +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* +%{_javadir}/* +%doc License.txt +%doc License.html + + +%files javadoc +%{_javadocdir}/%{name} +%doc License.txt +%doc License.html + + +%changelog +* Fri Dec 27 2013 Daniel Mach - 2.2.5-6 +- Mass rebuild 2013-12-27 + +* Fri Oct 25 2013 Ade Lee - 2.2.5-5 +- Resolves rhbz#1017802 - glassfish-jaxb: mock build failed on RHEL 7 + +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 13 2012 Juan Hernandez 2.2.5-2 +- Add missing xsom and rngom dependencies to the POM files + +* Sat Mar 10 2012 Juan Hernandez 2.2.5-1 +- Updated to upstream version 2.2.5 +- Removed classpath from manifest files + +* Wed Mar 7 2012 Juan Hernandez 2.2.4u1-4 +- Updated to reflect the change from glassfish-fi to glassfish-fastinfoset + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-3 +- Updated to reflect the changes of the jar names in txw2 + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-2 +- Cleanup of the spec file + +* Sat Jan 21 2012 Marek Goldmann 2.2.4u1-1 +- Initial packaging +