Hello community, here is the log from the commit of package ws-jaxme for openSUSE:Factory checked in at 2017-09-13 22:28:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ws-jaxme (Old) and /work/SRC/openSUSE:Factory/.ws-jaxme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ws-jaxme" Wed Sep 13 22:28:04 2017 rev:16 rq:523594 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ws-jaxme/ws-jaxme.changes 2014-08-01 19:26:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ws-jaxme.new/ws-jaxme.changes 2017-09-13 22:28:10.225893332 +0200 @@ -1,0 +2,18 @@ +Tue Sep 12 06:58:17 UTC 2017 - [email protected] + +- Upgrade to 0.5.2 +- BuildConflict with java-devel >= 1.9, since this package cannot + be built with jdk9 +- BuildRequire java-devel >= 1.6 +- Specify java source and target level 1.6 +- Modified patch: + * ws-jaxme-java6.patch + - Adapt to the new context +- Added patches: + * ws-jaxme-sourcetarget.patch + - Build with java source and target level 1.6 + * ws-jaxme-use-commons-codec.patch + - Use apache-commons-codec for base64 functionality instead + or private APIs that can disapear any time + +------------------------------------------------------------------- Old: ---- ws-jaxme-0.5.1-src.tar.bz2 New: ---- ws-jaxme-0.5.2-src.tar.bz2 ws-jaxme-sourcetarget.patch ws-jaxme-use-commons-codec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ws-jaxme.spec ++++++ --- /var/tmp/diff_new_pack.IDxOJo/_old 2017-09-13 22:28:10.997784666 +0200 +++ /var/tmp/diff_new_pack.IDxOJo/_new 2017-09-13 22:28:10.997784666 +0200 @@ -1,7 +1,7 @@ # # spec file for package ws-jaxme # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define base_name jaxme Name: ws-jaxme -Version: 0.5.1 +Version: 0.5.2 Release: 0 Summary: Open source implementation of JAXB License: Apache-2.0 @@ -28,11 +28,15 @@ Patch0: ws-jaxme-docs_xml.patch Patch1: ws-jaxme-catalog.patch Patch2: ws-jaxme-java6.patch +Patch3: ws-jaxme-sourcetarget.patch +Patch4: ws-jaxme-use-commons-codec.patch BuildRequires: ant >= 1.6 BuildRequires: ant-apache-resolver BuildRequires: antlr +BuildRequires: apache-commons-codec BuildRequires: docbook-xsl-stylesheets BuildRequires: hsqldb +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools BuildRequires: jaxp_transform_impl BuildRequires: junit >= 3.8.1 @@ -42,8 +46,8 @@ BuildRequires: xml-commons-apis BuildRequires: xml-commons-resolver BuildRequires: xmldb-api -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildConflicts: java-devel >= 1.9 %description A Java/XML binding compiler takes as input a schema description (in @@ -96,16 +100,19 @@ document. %prep -%setup -q -n %{name} +%setup -q find . -name "*.jar" | xargs rm %patch0 -b .sav %patch1 -b .sav %patch2 -b .java6 +%patch3 -p1 +%patch4 -p1 %build export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver" export CLASSPATH=$(build-classpath \ antlr \ + apache-commons-codec \ hsqldb \ log4j \ xalan-j2 \ @@ -116,7 +123,7 @@ xml-commons-resolver \ junit) ant all Docs.all \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dbuild.sysclasspath=first \ -Ddocbook.home=%{_datadir}/xml/docbook \ -Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current @@ -139,16 +146,13 @@ cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version} %files -%defattr(0644,root,root,0755) %doc LICENSE %{_javadir}/%{base_name} %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %files manual -%defattr(0644,root,root,0755) %doc %{_docdir}/%{name}-%{version} %changelog ++++++ ws-jaxme-0.5.1-src.tar.bz2 -> ws-jaxme-0.5.2-src.tar.bz2 ++++++ ++++ 41413 lines of diff (skipped) ++++++ ws-jaxme-java6.patch ++++++ --- /var/tmp/diff_new_pack.IDxOJo/_old 2017-09-13 22:28:12.929512720 +0200 +++ /var/tmp/diff_new_pack.IDxOJo/_new 2017-09-13 22:28:12.929512720 +0200 @@ -1,158 +1,176 @@ ---- ant/jm.xml -+++ ant/jm.xml -@@ -127,7 +127,6 @@ - <target name="JM.compile" depends="dirs,JM.precompile"> - <javac classpathref="jaxme.class.path" debug="${debug}" - optimize="${optimize}" destdir="${build.jm.classes}" -- source="1.3" target="1.3" - failonerror="true"> - <src> - <pathelement location="${src.jm}"/> -@@ -184,7 +183,6 @@ - <target name="JM.localtest" depends="JM.generate"> - <javac debug="${debug}" - optimize="${optimize}" destdir="${build.jm.classes}" -- source="1.3" target="1.3" - failonerror="true"> - <src> - <pathelement location="${src.jm}"/> --- src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java +++ src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java -@@ -428,6 +428,55 @@ - } +@@ -21,16 +21,22 @@ + import java.io.OutputStreamWriter; + import java.io.UnsupportedEncodingException; + import java.io.Writer; ++import java.io.File; + + import javax.xml.bind.JAXBException; + import javax.xml.bind.MarshalException; + import javax.xml.bind.Marshaller; + import javax.xml.bind.PropertyException; ++import javax.xml.bind.attachment.AttachmentMarshaller; ++import javax.xml.bind.annotation.adapters.XmlAdapter; + import javax.xml.namespace.QName; + import javax.xml.transform.Result; + import javax.xml.transform.dom.DOMResult; + import javax.xml.transform.sax.SAXResult; + import javax.xml.transform.stream.StreamResult; ++import javax.xml.stream.XMLStreamWriter; ++import javax.xml.stream.XMLEventWriter; ++import javax.xml.validation.Schema; + import org.apache.ws.jaxme.*; + import org.apache.ws.jaxme.JMElement; +@@ -430,4 +436,55 @@ public Node getNode(java.lang.Object contentTree) throws JAXBException { -- throw new UnsupportedOperationException("JaxMe doesn't support live DOM views"); -+ throw new UnsupportedOperationException("JaxMe doesn't support live DOM views"); + throw new UnsupportedOperationException("JaxMe doesn't support live DOM views"); } + -+ public javax.xml.bind.Marshaller.Listener getListener() { -+ throw new RuntimeException("Not implemented method getListener()"); -+ } -+ -+ public void setListener(javax.xml.bind.Marshaller.Listener listener) { -+ throw new RuntimeException("Not implemented method setListener()"); -+ } -+ -+ public javax.xml.validation.Schema getSchema() { -+ throw new RuntimeException("Not implemented method getSchema()"); -+ } -+ -+ public void setSchema(javax.xml.validation.Schema schema) { -+ throw new RuntimeException("Not implemented method setSchema()"); -+ } -+ -+ public javax.xml.bind.attachment.AttachmentMarshaller getAttachmentMarshaller() { -+ throw new RuntimeException("Not implemented method getAttachmentMarshaller()"); -+ } -+ -+ public void setAttachmentMarshaller(javax.xml.bind.attachment.AttachmentMarshaller am) { -+ throw new RuntimeException("Not implemented method getAttachmentMarshaller()"); -+ } -+ -+ public <A extends javax.xml.bind.annotation.adapters.XmlAdapter> A getAdapter(Class<A> type) { -+ throw new RuntimeException("Not implemented method getAdapter()"); -+ } -+ -+ public <A extends javax.xml.bind.annotation.adapters.XmlAdapter> void setAdapter(Class<A> type, A adapter) { -+ throw new RuntimeException("Not implemented method setAdapter()"); -+ } -+ -+ public void setAdapter(javax.xml.bind.annotation.adapters.XmlAdapter adapter) { -+ throw new RuntimeException("Not implemented method setAdapter()"); -+ } -+ -+ public void marshal(Object jaxbElement, javax.xml.stream.XMLEventWriter writer) throws JAXBException { -+ throw new RuntimeException("Not implemented method marshal()"); -+ } -+ -+ public void marshal(Object jaxbElement, javax.xml.stream.XMLStreamWriter writer) throws JAXBException { -+ throw new RuntimeException("Not implemented method marshal()"); -+ } -+ -+ public void marshal(Object jaxbElement, java.io.File file) throws JAXBException { -+ throw new RuntimeException("Not implemented method marshal()"); -+ } + ++// added to support JDK6 ++ ++ public void marshal(Object jaxbElement, File output) throws JAXBException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void marshal(Object jaxbElement, XMLStreamWriter writer) throws JAXBException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void marshal(Object jaxbElement, XMLEventWriter writer) throws JAXBException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAdapter(XmlAdapter adapter) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAdapter(Class type, XmlAdapter adapter) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public XmlAdapter getAdapter(Class type) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setAttachmentMarshaller(AttachmentMarshaller am) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public AttachmentMarshaller getAttachmentMarshaller() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSchema(Schema schema) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Schema getSchema() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setListener(Listener listener) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Listener getListener() { ++ throw new UnsupportedOperationException(); ++ } } --- src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java +++ src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java -@@ -170,11 +170,76 @@ - return unmarshal(node); - } else { - throw new IllegalArgumentException("Unknown type of Source: " + pSource.getClass().getName() + -- ", only SAXSource, StreamSource and DOMSource are supported."); -+ ", only SAXSource, StreamSource and DOMSource are supported."); - } - } -- -+ +@@ -26,6 +26,10 @@ + import javax.xml.bind.JAXBException; + import javax.xml.bind.UnmarshalException; + import javax.xml.bind.UnmarshallerHandler; ++import javax.xml.bind.JAXBElement; ++import javax.xml.bind.Unmarshaller; ++import javax.xml.bind.attachment.AttachmentUnmarshaller; ++import javax.xml.bind.annotation.adapters.XmlAdapter; + import javax.xml.parsers.ParserConfigurationException; + import javax.xml.parsers.SAXParser; + import javax.xml.parsers.SAXParserFactory; +@@ -33,6 +37,9 @@ + import javax.xml.transform.dom.DOMSource; + import javax.xml.transform.sax.SAXSource; + import javax.xml.transform.stream.StreamSource; ++import javax.xml.stream.XMLStreamReader; ++import javax.xml.stream.XMLEventReader; ++import javax.xml.validation.Schema; + + import org.apache.ws.jaxme.JMUnmarshaller; + import org.apache.ws.jaxme.util.DOMSerializer; +@@ -177,4 +184,71 @@ public UnmarshallerHandler getUnmarshallerHandler() { return new JMUnmarshallerHandlerImpl(this); } + -+ public javax.xml.bind.Unmarshaller.Listener getListener() { -+ throw new RuntimeException("Not implemented method getListener()"); -+ } + -+ public void setListener(javax.xml.bind.Unmarshaller.Listener listener) { -+ throw new RuntimeException("Not implemented method setListener()"); ++// added to support JDK6 ++ ++ public Object unmarshal(Reader reader) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public <A extends javax.xml.bind.annotation.adapters.XmlAdapter> A getAdapter(Class<A> type) { -+ throw new RuntimeException("Not implemented method getAdapter()"); ++ public JAXBElement unmarshal(Node node, Class declaredType) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public <A extends javax.xml.bind.annotation.adapters.XmlAdapter> void setAdapter(Class<A> type, A adapter) { -+ throw new RuntimeException("Not implemented method setAdapter()"); ++ public JAXBElement unmarshal(Source source, Class declaredType) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public void setAdapter(javax.xml.bind.annotation.adapters.XmlAdapter adapter) { -+ throw new RuntimeException("Not implemented method setAdapter()"); ++ public Object unmarshal(XMLStreamReader reader) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public javax.xml.validation.Schema getSchema() { -+ throw new RuntimeException("Not implemented method getSchema()"); ++ public JAXBElement unmarshal(XMLStreamReader reader, Class declaredType) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public void setSchema(javax.xml.validation.Schema schema) { -+ throw new RuntimeException("Not implemented method setSchema()"); ++ public Object unmarshal(XMLEventReader reader) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public <T> javax.xml.bind.JAXBElement<T> unmarshal(javax.xml.stream.XMLEventReader reader, Class<T> declaredType) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ public JAXBElement unmarshal(XMLEventReader reader, Class declaredType) throws JAXBException { ++ throw new UnsupportedOperationException(); + } + -+ public Object unmarshal(javax.xml.stream.XMLEventReader reader) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ public void setSchema(Schema schema) { ++ throw new UnsupportedOperationException(); + } -+ -+ public <T> javax.xml.bind.JAXBElement<T> unmarshal(javax.xml.stream.XMLStreamReader reader, Class<T> declaredType) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ ++ public Schema getSchema() { ++ throw new UnsupportedOperationException(); + } + -+ public Object unmarshal(javax.xml.stream.XMLStreamReader reader) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ public void setAdapter(XmlAdapter adapter) { ++ throw new UnsupportedOperationException(); + } + -+ public <T> javax.xml.bind.JAXBElement<T> unmarshal(org.w3c.dom.Node node, Class<T> declaredType) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ public void setAdapter(Class type, XmlAdapter adapter) { ++ throw new UnsupportedOperationException(); + } -+ -+ public Object unmarshal(java.io.Reader reader) throws JAXBException { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ ++ public XmlAdapter getAdapter(Class type) { ++ throw new UnsupportedOperationException(); + } + -+ public <T> javax.xml.bind.JAXBElement<T> unmarshal(javax.xml.transform.Source source, Class<T> declaredType) { -+ throw new RuntimeException("Not implemented method unmarshal()"); ++ public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) { ++ throw new UnsupportedOperationException(); + } + -+ public javax.xml.bind.attachment.AttachmentUnmarshaller getAttachmentUnmarshaller() { -+ throw new RuntimeException("Not implemented method getAttachmentUnmarshaller()"); ++ public AttachmentUnmarshaller getAttachmentUnmarshaller() { ++ throw new UnsupportedOperationException(); + } + -+ public void setAttachmentUnmarshaller(javax.xml.bind.attachment.AttachmentUnmarshaller foo) { -+ throw new RuntimeException("Not implemented method setAttachmentUnmarshaller()"); ++ public void setListener(Listener listener) { ++ throw new UnsupportedOperationException(); + } + ++ public Listener getListener() { ++ throw new UnsupportedOperationException(); ++ } } ++++++ ws-jaxme-sourcetarget.patch ++++++ --- ws-jaxme-0.5.2/ant/jm.xml 2012-07-27 12:18:59.000000000 +0200 +++ ws-jaxme-0.5.2/ant/jm.xml 2012-07-27 16:07:58.924849227 +0200 @@ -128,7 +128,7 @@ <target name="JM.compile" depends="dirs,JM.precompile"> <javac classpathref="jaxme.class.path" debug="${debug}" optimize="${optimize}" destdir="${build.jm.classes}" - source="1.3" target="1.3" + source="1.6" target="1.6" failonerror="true"> <src> <pathelement location="${src.jm}"/> @@ -185,7 +185,7 @@ <target name="JM.localtest" depends="JM.generate"> <javac debug="${debug}" optimize="${optimize}" destdir="${build.jm.classes}" - source="1.3" target="1.3" + source="1.6" target="1.6" failonerror="true"> <src> <pathelement location="${src.jm}"/> --- ws-jaxme-0.5.2/ant/js.xml 2012-07-27 12:18:59.000000000 +0200 +++ ws-jaxme-0.5.2/ant/js.xml 2012-07-27 16:08:26.538504008 +0200 @@ -71,7 +71,7 @@ <target name="JS.compile" depends="JS.antlr,init"> <javac destdir="${build.js.classes}" debug="${debug}" - source="1.3" target="1.3" + source="1.6" target="1.6" optimize="${optimize}" classpathref="js.class.path"> <src> <pathelement location="${src.js}"/> @@ -160,7 +160,7 @@ <javac destdir="${build.js.test.classes}" debug="${debug}" optimize="${optimize}" includes="org/apache/ws/jaxme/js/junit/**/*" - source="1.3" target="1.3" + source="1.6" target="1.6" classpathref="js.test.path"> <src path="${src.js}"/> <src path="${build.js.src}"/> --- ws-jaxme-0.5.2/ant/macros.xml 2005-07-14 20:32:17.000000000 +0200 +++ ws-jaxme-0.5.2/ant/macros.xml 2012-07-27 16:08:37.033372804 +0200 @@ -54,7 +54,7 @@ <mkdir dir="@{destdir}"/> <javac destdir="@{destdir}" srcdir="@{srcdir}" debug="${debug}" optimize="${optimize}" classpathref="@{classpathref}" - excludes="@{excludes}" source="1.3" target="1.3"> + excludes="@{excludes}" source="1.6" target="1.6"> <exclude name="@{java14classes}" unless="have14"/> </javac> </sequential> diff -up ws-jaxme-0.5.2/ant/pm.xml ws-jaxme-0.5.2/ant/pm.xml --- ws-jaxme-0.5.2/ant/pm.xml 2012-07-27 12:18:59.000000000 +0200 +++ ws-jaxme-0.5.2/ant/pm.xml 2012-07-27 16:08:42.912299308 +0200 @@ -70,7 +70,7 @@ <target name="PM.compile" depends="dirs,JM.all"> <javac classpathref="pm.class.path" debug="${debug}" optimize="${optimize}" destdir="${build.pm.classes}" - source="1.3" target="1.3" + source="1.6" target="1.6" srcdir="${src.pm}"> <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/> <exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/> @@ -112,7 +112,7 @@ <target name="PM.generate.compile" depends="PM.generate"> <javac debug="${debug}" - source="1.3" target="1.3" + source="1.6" target="1.6" optimize="${optimize}" destdir="${build.pm.test.classes}"> <classpath> <path refid="pm.class.path"/> ++++++ ws-jaxme-use-commons-codec.patch ++++++ --- ./src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.sav 2007-02-12 12:33:45.000000000 -0500 +++ ./src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java 2007-02-12 12:35:20.000000000 -0500 @@ -18,8 +18,7 @@ import java.io.IOException; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import org.apache.commons.codec.binary.Base64; /** A utility class for working with base64 encoding. @@ -37,13 +36,13 @@ * base64 encoded byte array. */ public static byte[] decode(String pValue) throws IOException { - return (new BASE64Decoder()).decodeBuffer(pValue); + return (new Base64()).decode(pValue.getBytes()); } /** Converts the base64 encoded byte array <code>pValue</code> * into a string. */ public static String encode(byte[] pValue) { - return (new BASE64Encoder()).encode(pValue); + return new String((new Base64()).encodeBase64(pValue)); } }
