From db8edccc5c49690f252e2f5a07489d7093f4395c Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 01 2019 21:13:37 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 621ee41..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/glassfish-jaxb-2.2.5.tar.gz -/jaxb-ri-2.2.11.src.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec deleted file mode 100644 index 85dbc70..0000000 --- a/glassfish-jaxb.spec +++ /dev/null @@ -1,327 +0,0 @@ -Name: glassfish-jaxb -Version: 2.2.11 -Release: 11%{?dist} -Summary: JAXB Reference Implementation - -License: CDDL-1.1 and GPLv2 with exceptions -URL: http://jaxb.java.net - -Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip -Patch0: txw2-args4j.patch - -BuildRequires: maven-local -BuildRequires: mvn(args4j:args4j) -BuildRequires: mvn(com.sun.istack:istack-commons-runtime) -BuildRequires: mvn(com.sun.istack:istack-commons-tools) -BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) -BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) -BuildRequires: mvn(com.sun.xsom:xsom) -BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.java.dev.msv:msv-core) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.jvnet.staxex:stax-ex) -BuildRequires: mvn(relaxngDatatype:relaxngDatatype) - -Requires: glassfish-jaxb1-impl = %{version}-%{release} -Requires: %{name}-bom = %{version}-%{release} -Requires: %{name}-bom-ext = %{version}-%{release} -Requires: %{name}-codemodel = %{version}-%{release} -Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} -Requires: %{name}-codemodel-parent = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-external-parent = %{version}-%{release} -Requires: %{name}-jxc = %{version}-%{release} -Requires: %{name}-parent = %{version}-%{release} -Requires: %{name}-rngom = %{version}-%{release} -Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-runtime-parent = %{version}-%{release} -Requires: %{name}-txw2 = %{version}-%{release} -Requires: %{name}-txwc2 = %{version}-%{release} -Requires: %{name}-txw-parent = %{version}-%{release} -Requires: %{name}-xjc = %{version}-%{release} - -BuildArch: noarch - -%description -GlassFish JAXB Reference Implementation. - -%package codemodel -Summary: Codemodel Core - -%description codemodel -The core functionality of the CodeModel java source code generation -library. - -%package codemodel-annotation-compiler -Summary: Codemodel Annotation Compiler - -%description codemodel-annotation-compiler -The annotation compiler ant task for the CodeModel java source code -generation library. - -%package -n glassfish-jaxb1-impl -Summary: JAXB1 Runtime - -%description -n glassfish-jaxb1-impl -Runtime classes for JAXB1 runtime implementation. - -%package bom -Summary: JAXB BOM - -%description bom -JAXB Bill of Materials (BOM) - -%package bom-ext -Summary: JAXB BOM with all dependencies - -%description bom-ext -JAXB Bill of Materials (BOM) with all dependencies. - -%package codemodel-parent -Summary: Codemodel parent POM - -%description codemodel-parent -This package contains codemodel parent POM. - -%package core -Summary: JAXB Core - -%description core -JAXB Core module. Contains sources required by XJC, JXC and Runtime -modules. - -%package external-parent -Summary: JAXB External parent POM - -%description external-parent -JAXB External parent POM. - -%package jxc -Summary: JAXB schema generator - -%description jxc -The tool to generate XML schema based on java classes. - -%package parent -Summary: JAXB parent POM - -%description parent -This package contains parent POM. - -%package runtime -Summary: JAXB Runtime - -%description runtime -JAXB (JSR 222) Reference Implementation - -%package runtime-parent -Summary: JAXB Runtime parent POM - -%description runtime-parent -This package contains Runtime parent POM. - -%package txw-parent -Summary: JAXB TXW parent POM - -%description txw-parent -This package contains TXW parent POM. - -%package xjc -Summary: JAXB XJC - -%description xjc -JAXB Binding Compiler. Contains source code needed for binding -customization files into java sources. In other words: the tool to -generate java classes for the given xml representation. - -%package rngom -Summary: RELAX NG Object Model/Parser - -%description rngom -This package contains RELAX NG Object Model/Parser. - -%package txw2 -Summary: TXW2 Runtime - -%description txw2 -TXW is a library that allows you to write XML documents. - -%package txwc2 -Summary: TXW2 Compiler - -%description txwc2 -JAXB schema generator. The tool to generate XML schema based on java -classes. - -%package javadoc -Summary: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -c - -%patch0 -p1 - -%pom_disable_module bundles - -%pom_remove_dep com.sun:tools -%pom_add_dep_mgmt com.sun:tools -%pom_remove_dep com.sun:tools jxc -%pom_add_dep com.sun:tools jxc - -%pom_remove_dep com.sun.xml.bind:jaxb-release-documentation bundles/ri -%pom_remove_dep com.sun.xml.bind:jaxb-samples bundles/ri - -%pom_remove_plugin :gfnexus-maven-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :buildnumber-maven-plugin - -%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" -%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" - -%build -%mvn_build -f -s -- -Ddev -DbuildNumber=unknown - -%install -%mvn_install - -%files -%doc License.txt licenceheader.txt License.html - -%files codemodel -f .mfiles-codemodel -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler -%dir %{_javadir}/%{name} - -%files -n glassfish-jaxb1-impl -f .mfiles-jaxb1-impl -%dir %{_javadir}/%{name} - -%files bom -f .mfiles-jaxb-bom -%doc License.txt licenceheader.txt License.html - -%files bom-ext -f .mfiles-jaxb-bom-ext - -%files codemodel-parent -f .mfiles-jaxb-codemodel-parent - -%files core -f .mfiles-jaxb-core -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files external-parent -f .mfiles-jaxb-external-parent - -%files jxc -f .mfiles-jaxb-jxc -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files parent -f .mfiles-jaxb-parent - -%files runtime -f .mfiles-jaxb-runtime -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files runtime-parent -f .mfiles-jaxb-runtime-parent - -%files txw-parent -f .mfiles-jaxb-txw-parent - -%files xjc -f .mfiles-jaxb-xjc -%dir %{_javadir}/%{name} - -%files rngom -f .mfiles-rngom -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files txw2 -f .mfiles-txw2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files txwc2 -f .mfiles-txwc2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files javadoc -f .mfiles-javadoc -%doc License.txt licenceheader.txt License.html - - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 25 2018 Michael Simacek - 2.2.11-9 -- Reduce build deps - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Nov 09 2017 Michael Simacek - 2.2.11-7 -- Specify CDDL license version - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 20 2015 Michal Srb - 2.2.11-2 -- Split into subpackages (Resolves: rhbz#1204187) - -* Mon Jan 19 2015 Michal Srb - 2.2.11-1 -- Update to upstream version 2.2.11 - -* Mon Oct 27 2014 Michal Srb - 2.2.5-8 -- Fix FTBFS (Resolves: rhbz#1106636) -- Adapt to current packaging guidelines -- Remove R, add BR: javapackages-local (for %%mvn_artifact macro) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.2.5-6 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* 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 - diff --git a/sources b/sources deleted file mode 100644 index a1b8830..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bed496dd96e5b9efc4539fc5bdb69c69 jaxb-ri-2.2.11.src.zip diff --git a/txw2-args4j.patch b/txw2-args4j.patch deleted file mode 100644 index df71f86..0000000 --- a/txw2-args4j.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -index 3c8cc84..3f1a092 100644 ---- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -+++ b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -@@ -43,10 +43,10 @@ package com.sun.tools.txw2; - import com.sun.codemodel.writer.FileCodeWriter; - import com.sun.codemodel.writer.SingleStreamCodeWriter; - import com.sun.tools.txw2.model.NodeSet; -+import org.kohsuke.args4j.Argument; -+import org.kohsuke.args4j.Option; - import org.kohsuke.args4j.CmdLineException; - import org.kohsuke.args4j.CmdLineParser; --import org.kohsuke.args4j.opts.BooleanOption; --import org.kohsuke.args4j.opts.StringOption; - import org.kohsuke.rngom.parse.IllegalSchemaException; - import org.kohsuke.rngom.parse.Parseable; - import org.kohsuke.rngom.parse.compact.CompactParseable; -@@ -60,6 +60,8 @@ import java.io.File; - import java.io.IOException; - import java.net.MalformedURLException; - import java.util.Properties; -+import java.util.List; -+import java.util.ArrayList; - - /** - * Programatic entry point to the TXW compiler. -@@ -73,26 +75,39 @@ public class Main { - this.opts = opts; - } - -- public static void main(String[] args) { -- System.exit(run(args)); -+ public static class Options { -+ @Argument -+ public List arguments = new ArrayList(); -+ -+ @Option(name="-o") -+ public String output; -+ -+ @Option(name="-p") -+ public String pkg; -+ -+ @Option(name="-c") -+ public boolean compact; -+ -+ @Option(name="-x") -+ public boolean xml; -+ -+ @Option(name="-xsd") -+ public boolean xsd; -+ -+ @Option(name="-h") -+ public boolean chain; - } - -- public static class Options { -- public StringOption output = new StringOption("-o"); -- public StringOption pkg = new StringOption("-p"); -- public BooleanOption compact = new BooleanOption("-c"); -- public BooleanOption xml = new BooleanOption("-x"); -- public BooleanOption xsd = new BooleanOption("-xsd"); -- public BooleanOption chain = new BooleanOption("-h"); -+ public static void main(String[] args) { -+ System.exit(run(args)); - } - - public static int run(String[] args) { - Options opts = new Options(); -- CmdLineParser parser = new CmdLineParser(); -- parser.addOptionClass(opts); -+ CmdLineParser parser = new CmdLineParser(opts); - - try { -- parser.parse(args); -+ parser.parseArgument(args); - } catch (CmdLineException e) { - System.out.println(e.getMessage()); - printUsage(); -@@ -102,9 +117,9 @@ public class Main { - TxwOptions topts = new TxwOptions(); - topts.errorListener = new ConsoleErrorReporter(System.out); - -- if(opts.output.value!=null) { -+ if(opts.output != null) { - try { -- topts.codeWriter = new FileCodeWriter(new File(opts.output.value)); -+ topts.codeWriter = new FileCodeWriter(new File(opts.output)); - } catch( IOException e ) { - System.out.println(e.getMessage()); - printUsage(); -@@ -114,12 +129,12 @@ public class Main { - topts.codeWriter = new SingleStreamCodeWriter(System.out); - } - -- if(opts.chain.isOn()) { -+ if(opts.chain) { - topts.chainMethod = true; - } - -- if(opts.pkg.value!=null) { -- topts._package = topts.codeModel._package(opts.pkg.value); -+ if(opts.pkg != null) { -+ topts._package = topts.codeModel._package(opts.pkg); - } else { - topts._package = topts.codeModel.rootPackage(); - } -@@ -146,21 +161,21 @@ public class Main { - * out of the specified schema file. - */ - private static SchemaBuilder makeSourceSchema(CmdLineParser parser, Options opts, ErrorHandler eh) throws MalformedURLException { -- File f = new File((String)parser.getArguments().get(0)); -+ File f = new File(opts.arguments.get(0)); - final InputSource in = new InputSource(f.toURL().toExternalForm()); - -- if(opts.xsd.isOff() && opts.xml.isOff() && opts.compact.isOff()) { -+ if(!opts.xsd && !opts.xml && !opts.compact) { - // auto detect - if(in.getSystemId().endsWith(".rnc")) -- opts.compact.value=true; -+ opts.compact = true; - else - if(in.getSystemId().endsWith(".rng")) -- opts.xml.value=true; -+ opts.xml = true; - else -- opts.xsd.value=true; -+ opts.xsd = true; - } - -- if(opts.xsd.isOn()) -+ if(opts.xsd) - return new XmlSchemaLoader(in); - - final Parseable parseable = makeRELAXNGSource(opts, in, eh, f); -@@ -169,10 +184,10 @@ public class Main { - } - - private static Parseable makeRELAXNGSource(Options opts, final InputSource in, ErrorHandler eh, File f) { -- if(opts.compact.isOn()) -+ if(opts.compact) - return new CompactParseable(in,eh); - -- if(opts.xml.isOn()) -+ if(opts.xml) - return new SAXParseable(in,eh); - - // otherwise sniff from the file extension