Author: ebourg-guest
Date: 2013-06-26 15:33:04 +0000 (Wed, 26 Jun 2013)
New Revision: 16933
Added:
tags/jaxme/0.5.2+dfsg-7/
tags/jaxme/0.5.2+dfsg-7/debian/changelog
tags/jaxme/0.5.2+dfsg-7/debian/control
tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff
Removed:
tags/jaxme/0.5.2+dfsg-7/debian/changelog
tags/jaxme/0.5.2+dfsg-7/debian/control
tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff
Log:
[svn-buildpackage] Tagging jaxme 0.5.2+dfsg-7
Deleted: tags/jaxme/0.5.2+dfsg-7/debian/changelog
===================================================================
--- trunk/jaxme/debian/changelog 2013-06-26 13:07:01 UTC (rev 16926)
+++ tags/jaxme/0.5.2+dfsg-7/debian/changelog 2013-06-26 15:33:04 UTC (rev
16933)
@@ -1,70 +0,0 @@
-jaxme (0.5.2+dfsg-6) unstable; urgency=low
-
- * Add OSGi metadata to jar manifests
- * Add Jakub Adam to Uploaders
-
- -- Jakub Adam <jakub.a...@ktknet.cz> Mon, 09 Jan 2012 22:28:04 +0100
-
-jaxme (0.5.2+dfsg-5) unstable; urgency=low
-
- * Team upload.
- * Added build-arch and build-indep targets to d/rules.
- * Merged Build-Depends and Build-Depends-Indep.
- * Bumped Standards-Versions to 3.9.2 - no changes required.
- * Removed Marcus Better from uploaders. Thanks for your work
- on this package.
- * Bumped debhelper compat to 8.
-
- -- Niels Thykier <ni...@thykier.net> Sat, 05 Nov 2011 23:19:53 +0100
-
-jaxme (0.5.2+dfsg-4) unstable; urgency=low
-
- * Team upload.
- * Switch to source format 3.0.
- * Add Depends: ${misc:Depends}.
- * Remove Java runtime dependencies.
-
- -- Torsten Werner <twer...@debian.org> Sat, 06 Aug 2011 11:00:35 +0200
-
-jaxme (0.5.2+dfsg-3) unstable; urgency=low
-
- [ Matthias Klose ]
- * Build using default-jdk. Closes: #508956.
- * JMMarshallerImpl.java, JMUnmarshallerImpl.java: Add methods to support
- OpenJDK6. LP: #337869.
- * Split out a libjaxme-java-doc package. Closes: #513661.
-
- [ Michael Koch ]
- * Build-Depends on debhelper (>= 7).
- * Replaced dh_clean -k by dh_prep.
-
- [ Barry deFreese ]
- * Fix doc-base section.
- * Remove the full text of the Apache-2.0 license from debian/copyright.
- * Move to Section: java. Remove duplicate section from binary.
- * Mangle debian version in watch file.
- * Bump Standards Version to 3.8.3.
-
- -- Michael Koch <konque...@gmx.de> Tue, 03 Nov 2009 22:13:52 +0100
-
-jaxme (0.5.2+dfsg-2) unstable; urgency=low
-
- * Apply patch to disable MarshallerTest as it is not timezone clean.
- Works with summer time and fails with winter time. Closes: 439488.
- * Updated Standards-Version to 3.7.3.
- * Added Homepage, Vcs-Svn and Vcs-Browser fields.
-
- -- Michael Koch <konque...@gmx.de> Fri, 28 Dec 2007 10:07:47 +0100
-
-jaxme (0.5.2+dfsg-1) unstable; urgency=low
-
- * New upstream release. Closes: #429523.
- * Added myself to Uploaders.
-
- -- Michael Koch <konque...@gmx.de> Mon, 16 Jul 2007 19:24:29 +0200
-
-jaxme (0.5.1+dfsg-1) unstable; urgency=low
-
- * Initial release. (Closes: #296117)
-
- -- Marcus Better <mar...@better.se> Sun, 1 Oct 2006 11:24:17 +0200
Copied: tags/jaxme/0.5.2+dfsg-7/debian/changelog (from rev 16927,
trunk/jaxme/debian/changelog)
===================================================================
--- tags/jaxme/0.5.2+dfsg-7/debian/changelog (rev 0)
+++ tags/jaxme/0.5.2+dfsg-7/debian/changelog 2013-06-26 15:33:04 UTC (rev
16933)
@@ -0,0 +1,80 @@
+jaxme (0.5.2+dfsg-7) unstable; urgency=low
+
+ * Replaced the build dependency on libhsqldb-java by libhsqldb1.8.0-java
+ (Closes: #713766)
+ * Removed Michael Koch from the uploaders list (Closes: #654032)
+ * Updated Standards-Versions to 3.9.4 (no changes)
+ * Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 26 Jun 2013 15:33:32 +0200
+
+jaxme (0.5.2+dfsg-6) unstable; urgency=low
+
+ * Add OSGi metadata to jar manifests
+ * Add Jakub Adam to Uploaders
+
+ -- Jakub Adam <jakub.a...@ktknet.cz> Mon, 09 Jan 2012 22:28:04 +0100
+
+jaxme (0.5.2+dfsg-5) unstable; urgency=low
+
+ * Team upload.
+ * Added build-arch and build-indep targets to d/rules.
+ * Merged Build-Depends and Build-Depends-Indep.
+ * Bumped Standards-Versions to 3.9.2 - no changes required.
+ * Removed Marcus Better from uploaders. Thanks for your work
+ on this package.
+ * Bumped debhelper compat to 8.
+
+ -- Niels Thykier <ni...@thykier.net> Sat, 05 Nov 2011 23:19:53 +0100
+
+jaxme (0.5.2+dfsg-4) unstable; urgency=low
+
+ * Team upload.
+ * Switch to source format 3.0.
+ * Add Depends: ${misc:Depends}.
+ * Remove Java runtime dependencies.
+
+ -- Torsten Werner <twer...@debian.org> Sat, 06 Aug 2011 11:00:35 +0200
+
+jaxme (0.5.2+dfsg-3) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Build using default-jdk. Closes: #508956.
+ * JMMarshallerImpl.java, JMUnmarshallerImpl.java: Add methods to support
+ OpenJDK6. LP: #337869.
+ * Split out a libjaxme-java-doc package. Closes: #513661.
+
+ [ Michael Koch ]
+ * Build-Depends on debhelper (>= 7).
+ * Replaced dh_clean -k by dh_prep.
+
+ [ Barry deFreese ]
+ * Fix doc-base section.
+ * Remove the full text of the Apache-2.0 license from debian/copyright.
+ * Move to Section: java. Remove duplicate section from binary.
+ * Mangle debian version in watch file.
+ * Bump Standards Version to 3.8.3.
+
+ -- Michael Koch <konque...@gmx.de> Tue, 03 Nov 2009 22:13:52 +0100
+
+jaxme (0.5.2+dfsg-2) unstable; urgency=low
+
+ * Apply patch to disable MarshallerTest as it is not timezone clean.
+ Works with summer time and fails with winter time. Closes: 439488.
+ * Updated Standards-Version to 3.7.3.
+ * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+
+ -- Michael Koch <konque...@gmx.de> Fri, 28 Dec 2007 10:07:47 +0100
+
+jaxme (0.5.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release. Closes: #429523.
+ * Added myself to Uploaders.
+
+ -- Michael Koch <konque...@gmx.de> Mon, 16 Jul 2007 19:24:29 +0200
+
+jaxme (0.5.1+dfsg-1) unstable; urgency=low
+
+ * Initial release. (Closes: #296117)
+
+ -- Marcus Better <mar...@better.se> Sun, 1 Oct 2006 11:24:17 +0200
Deleted: tags/jaxme/0.5.2+dfsg-7/debian/control
===================================================================
--- trunk/jaxme/debian/control 2013-06-26 13:07:01 UTC (rev 16926)
+++ tags/jaxme/0.5.2+dfsg-7/debian/control 2013-06-26 15:33:04 UTC (rev
16933)
@@ -1,43 +0,0 @@
-Source: jaxme
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
-Uploaders: Michael Koch <konque...@gmx.de>,
- Jakub Adam <jakub.a...@ktknet.cz>
-Build-Depends: debhelper (>= 8), default-jdk, ant, ant-optional,
- antlr, junit, liblog4j1.2-java, libxerces2-java,
- libxalan2-java, libcommons-codec-java, libhsqldb-java,
- javahelper
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jaxme/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jaxme/
-Homepage: http://ws.apache.org/jaxme/
-
-Package: libjaxme-java
-Architecture: all
-Depends: ${misc:Depends}, liblog4j1.2-java, libcommons-codec-java
-Suggests: libjaxme-java-doc
-Description: implementation of the JAXB specification for Java/XML binding
- A Java/XML binding compiler takes as input a schema description. The output
- is a set of Java classes:
- * A Java bean class compatible with the schema description.
- * An unmarshaller that converts a XML document into the equivalent Java bean.
- * A marshaller that converts the Java bean back into the XML document.
- .
- This package contains an implementation of the JAXB API, the JaxMe
- JavaSource framework for generating Java sources, the JaxMe parser
- for XML schema and the JaxMe Persistence Management layer.
-
-Package: libjaxme-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: libjaxme-java (<= 0.5.2+dfsg-2)
-Description: documentation of the JAXB specification for Java/XML binding
- A Java/XML binding compiler takes as input a schema description. The output
- is a set of Java classes:
- * A Java bean class compatible with the schema description.
- * An unmarshaller that converts a XML document into the equivalent Java bean.
- * A marshaller that converts the Java bean back into the XML document.
- .
- This package contains the documentation for the libjavxme-java package.
Copied: tags/jaxme/0.5.2+dfsg-7/debian/control (from rev 16927,
trunk/jaxme/debian/control)
===================================================================
--- tags/jaxme/0.5.2+dfsg-7/debian/control (rev 0)
+++ tags/jaxme/0.5.2+dfsg-7/debian/control 2013-06-26 15:33:04 UTC (rev
16933)
@@ -0,0 +1,42 @@
+Source: jaxme
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
+Uploaders: Jakub Adam <jakub.a...@ktknet.cz>, Emmanuel Bourg
<ebo...@apache.org>
+Build-Depends: debhelper (>= 8), default-jdk, ant, ant-optional,
+ antlr, junit, liblog4j1.2-java, libxerces2-java,
+ libxalan2-java, libcommons-codec-java, libhsqldb1.8.0-java,
+ javahelper
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jaxme/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jaxme/
+Homepage: http://ws.apache.org/jaxme/
+
+Package: libjaxme-java
+Architecture: all
+Depends: ${misc:Depends}, liblog4j1.2-java, libcommons-codec-java
+Suggests: libjaxme-java-doc
+Description: implementation of the JAXB specification for Java/XML binding
+ A Java/XML binding compiler takes as input a schema description. The output
+ is a set of Java classes:
+ * A Java bean class compatible with the schema description.
+ * An unmarshaller that converts a XML document into the equivalent Java bean.
+ * A marshaller that converts the Java bean back into the XML document.
+ .
+ This package contains an implementation of the JAXB API, the JaxMe
+ JavaSource framework for generating Java sources, the JaxMe parser
+ for XML schema and the JaxMe Persistence Management layer.
+
+Package: libjaxme-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: libjaxme-java (<= 0.5.2+dfsg-2)
+Description: documentation of the JAXB specification for Java/XML binding
+ A Java/XML binding compiler takes as input a schema description. The output
+ is a set of Java classes:
+ * A Java bean class compatible with the schema description.
+ * An unmarshaller that converts a XML document into the equivalent Java bean.
+ * A marshaller that converts the Java bean back into the XML document.
+ .
+ This package contains the documentation for the libjavxme-java package.
Deleted: tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff
===================================================================
--- trunk/jaxme/debian/patches/upstream.diff 2013-06-26 13:07:01 UTC (rev
16926)
+++ tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff 2013-06-26
15:33:04 UTC (rev 16933)
@@ -1,363 +0,0 @@
---- jaxme-0.5.2+dfsg.orig/jaxme.properties
-+++ jaxme-0.5.2+dfsg/jaxme.properties
-@@ -0,0 +1,2 @@
-+preqs=/usr/share/java
-+javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
---- jaxme-0.5.2+dfsg.orig/build.xml
-+++ jaxme-0.5.2+dfsg/build.xml
-@@ -34,7 +34,7 @@
- <include name="prerequisites/junit*.jar"/>
- <include name="prerequisites/log4j*.jar"/>
- <include name="prerequisites/xercesImpl.jar"/>
-- <include name="prerequisites/xml-apis-1.3.02.jar"/>
-+ <include name="prerequisites/xml-apis.jar"/>
- <include name="prerequisites/xmldb-api-*.jar"/>
- </tarfileset>
- <tarfileset prefix="ws-jaxme-${version}/docs"
dir="${build.site}"/>
---- jaxme-0.5.2+dfsg.orig/ant/pm.xml
-+++ jaxme-0.5.2+dfsg/ant/pm.xml
-@@ -37,9 +37,9 @@
- <pathelement location="${dist}/jaxmexs-${version}.jar"/>
- <pathelement location="${dist}/jaxme2-${version}.jar"/>
- <pathelement location="${preqs}/beaver.jar"/>
-- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
-+ <pathelement location="${preqs}/hsqldb.jar"/>
- <pathelement location="${preqs}/ant.jar"/>
-- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
-+ <pathelement location="${preqs}/xml-apis.jar"/>
- <pathelement location="${preqs}/xercesImpl.jar"/>
- <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
- <!-- These aren't in the CVS and aren't necessary for the build -->
-@@ -73,6 +73,7 @@
- source="1.3" target="1.3"
- srcdir="${src.pm}">
- <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
-+ <exclude name="org/apache/ws/jaxme/pm/xmldb/*"/>
- <exclude name="org/apache/ws/jaxme/**/api4j/*"
unless="have.inoapi4j"/>
- <exclude name="org/apache/ws/jaxme/pm/ino/URLEncoder14.java"
unless="have14"/>
- </javac>
---- jaxme-0.5.2+dfsg.orig/ant/xs.xml
-+++ jaxme-0.5.2+dfsg/ant/xs.xml
-@@ -23,7 +23,7 @@
- <property name="src.xs" location="${basedir}/src/xs"/>
-
- <path id="xs.class.path">
-- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
-+ <pathelement location="${preqs}/xml-apis.jar"/>
- <pathelement location="${preqs}/junit.jar"/>
- <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
- </path>
---- jaxme-0.5.2+dfsg.orig/ant/api.xml
-+++ jaxme-0.5.2+dfsg/ant/api.xml
-@@ -25,7 +25,7 @@
- </target>
-
- <path id="api.class.path">
-- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
-+ <pathelement location="${preqs}/xml-apis.jar"/>
- </path>
-
- <target name="API.compile" depends="init">
---- jaxme-0.5.2+dfsg.orig/ant/jm.xml
-+++ jaxme-0.5.2+dfsg/ant/jm.xml
-@@ -34,9 +34,10 @@
- <pathelement location="${dist}/jaxmejs-${version}.jar"/>
- <pathelement location="${dist}/jaxmexs-${version}.jar"/>
- <pathelement location="${preqs}/ant.jar"/>
-- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
-+ <pathelement location="${preqs}/xml-apis.jar"/>
- <pathelement location="${preqs}/beaver.jar"/>
- <pathelement location="${preqs}/antlr.jar"/>
-+ <pathelement location="${preqs}/commons-codec.jar"/>
- </path>
-
- <path id="jaxme.test.path">
---- jaxme-0.5.2+dfsg.orig/ant/js.xml
-+++ jaxme-0.5.2+dfsg/ant/js.xml
-@@ -35,8 +35,8 @@
- <property name="src.js" location="${basedir}/src/js"/>
-
- <path id="js.class.path">
-- <pathelement location="${preqs}/log4j-1.2.8.jar"/>
-- <pathelement location="${preqs}/ant-1.5.4.jar"/>
-+ <pathelement location="${preqs}/log4j-1.2.jar"/>
-+ <pathelement location="${preqs}/ant.jar"/>
- <pathelement location="${preqs}/junit.jar"/>
- <pathelement location="${preqs}/antlr.jar"/>
- <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
-@@ -44,7 +44,7 @@
-
- <path id="js.test.path">
- <path refid="js.class.path"/>
-- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
-+ <pathelement location="${preqs}/hsqldb.jar"/>
- <pathelement location="${dist}/jaxmejs-${version}.jar"/>
- <pathelement location="${build.js.test.classes}"/>
- </path>
-@@ -62,7 +62,7 @@
- <target name="JS.antlr" depends="dirs">
- <java classname="antlr.Tool" failonerror="true">
- <classpath>
-- <pathelement location="${preqs}/antlr.jar"/>
-+ <pathelement location="/usr/share/java/antlr.jar"/>
- </classpath>
- <arg line="-o ${build.js.src}/org/apache/ws/jaxme/js/jparser"/>
- <arg file="${src.js}/org/apache/ws/jaxme/js/jparser/java15.g"/>
----
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
-@@ -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");
- }
-+
-+
-+// 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();
-+ }
- }
----
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
-@@ -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);
- }
-+
-+
-+// added to support JDK6
-+
-+ public Object unmarshal(Reader reader) throws JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public JAXBElement unmarshal(Node node, Class declaredType) throws
JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public JAXBElement unmarshal(Source source, Class declaredType) throws
JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public Object unmarshal(XMLStreamReader reader) throws JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public JAXBElement unmarshal(XMLStreamReader reader, Class declaredType)
throws JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public Object unmarshal(XMLEventReader reader) throws JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public JAXBElement unmarshal(XMLEventReader reader, Class declaredType)
throws JAXBException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public void setSchema(Schema schema) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public Schema getSchema() {
-+ 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 setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public AttachmentUnmarshaller getAttachmentUnmarshaller() {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public void setListener(Listener listener) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public Listener getListener() {
-+ throw new UnsupportedOperationException();
-+ }
- }
----
jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
-@@ -556,7 +556,8 @@
- marshaller.marshal(e, sw);
- String got = sw.toString();
- String expect = getAllElementString(false, pDateTimeFormat,
pDateFormat, pTimeFormat);
-- assertEquals(expect, got);
-+ // Disabled due to timezone problems.
-+ //assertEquals(expect, got);
- }
-
- private RootElementHandler getRootElementInfo(String pElement) throws
ParserConfigurationException, IOException, SAXException {
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
-@@ -88,9 +88,10 @@
- }
-
- public void testMarshalAnyAttribute() throws Exception {
-- String expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
-+ String expect1 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
-+ String expect2 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
- String got = getMarshalledAnyAttribute();
-- assertEquals(expect, got);
-+ assertTrue(expect1.equals(got) || expect2.equals(got));
- }
-
- protected void assertEquals(WildcardAttribute[] pExpect,
WildcardAttribute[] pGot) {
-@@ -123,9 +124,10 @@
- }
-
- public void testMarshalListAttribute() throws Exception {
-- String expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
-+ String expect1 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
-+ String expect2 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\";
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
- String got = getMarshalledListAttribute();
-- assertEquals(expect, got);
-+ assertTrue(expect1.equals(got) || expect2.equals(got));
- }
-
- public void testUnmarshalListAttribute() throws Exception {
-@@ -138,9 +140,10 @@
- }
-
- public void testMarshalOtherAttribute() throws Exception {
-- String expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
-+ String expect1 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"foo\"/>";
-+ String expect2 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value
2\" xmlns:p=\"foo\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
- String got = getMarshalledOtherAttribute();
-- assertEquals(expect, got);
-+ assertTrue(expect1.equals(got) || expect2.equals(got));
- }
-
- public void testUnmarshalOtherAttribute() throws Exception {
---- jaxme-0.5.2+dfsg.orig/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
-+++ jaxme-0.5.2+dfsg/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
-@@ -17,9 +17,7 @@
- package org.apache.ws.jaxme.util;
-
- 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 +35,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()).encode(pValue));
- }
- }
Copied: tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff (from rev 16927,
trunk/jaxme/debian/patches/upstream.diff)
===================================================================
--- tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff
(rev 0)
+++ tags/jaxme/0.5.2+dfsg-7/debian/patches/upstream.diff 2013-06-26
15:33:04 UTC (rev 16933)
@@ -0,0 +1,363 @@
+--- /dev/null
++++ b/jaxme.properties
+@@ -0,0 +1,2 @@
++preqs=/usr/share/java
++javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
+--- a/build.xml
++++ b/build.xml
+@@ -34,7 +34,7 @@
+ <include name="prerequisites/junit*.jar"/>
+ <include name="prerequisites/log4j*.jar"/>
+ <include name="prerequisites/xercesImpl.jar"/>
+- <include name="prerequisites/xml-apis-1.3.02.jar"/>
++ <include name="prerequisites/xml-apis.jar"/>
+ <include name="prerequisites/xmldb-api-*.jar"/>
+ </tarfileset>
+ <tarfileset prefix="ws-jaxme-${version}/docs"
dir="${build.site}"/>
+--- a/ant/pm.xml
++++ b/ant/pm.xml
+@@ -37,9 +37,9 @@
+ <pathelement location="${dist}/jaxmexs-${version}.jar"/>
+ <pathelement location="${dist}/jaxme2-${version}.jar"/>
+ <pathelement location="${preqs}/beaver.jar"/>
+- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
++ <pathelement location="${preqs}/hsqldb.jar"/>
+ <pathelement location="${preqs}/ant.jar"/>
+- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++ <pathelement location="${preqs}/xml-apis.jar"/>
+ <pathelement location="${preqs}/xercesImpl.jar"/>
+ <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
+ <!-- These aren't in the CVS and aren't necessary for the build -->
+@@ -73,6 +73,7 @@
+ source="1.3" target="1.3"
+ srcdir="${src.pm}">
+ <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
++ <exclude name="org/apache/ws/jaxme/pm/xmldb/*"/>
+ <exclude name="org/apache/ws/jaxme/**/api4j/*"
unless="have.inoapi4j"/>
+ <exclude name="org/apache/ws/jaxme/pm/ino/URLEncoder14.java"
unless="have14"/>
+ </javac>
+--- a/ant/xs.xml
++++ b/ant/xs.xml
+@@ -23,7 +23,7 @@
+ <property name="src.xs" location="${basedir}/src/xs"/>
+
+ <path id="xs.class.path">
+- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++ <pathelement location="${preqs}/xml-apis.jar"/>
+ <pathelement location="${preqs}/junit.jar"/>
+ <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
+ </path>
+--- a/ant/api.xml
++++ b/ant/api.xml
+@@ -25,7 +25,7 @@
+ </target>
+
+ <path id="api.class.path">
+- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++ <pathelement location="${preqs}/xml-apis.jar"/>
+ </path>
+
+ <target name="API.compile" depends="init">
+--- a/ant/jm.xml
++++ b/ant/jm.xml
+@@ -34,9 +34,10 @@
+ <pathelement location="${dist}/jaxmejs-${version}.jar"/>
+ <pathelement location="${dist}/jaxmexs-${version}.jar"/>
+ <pathelement location="${preqs}/ant.jar"/>
+- <pathelement location="${preqs}/xml-apis-1.3.02.jar"/>
++ <pathelement location="${preqs}/xml-apis.jar"/>
+ <pathelement location="${preqs}/beaver.jar"/>
+ <pathelement location="${preqs}/antlr.jar"/>
++ <pathelement location="${preqs}/commons-codec.jar"/>
+ </path>
+
+ <path id="jaxme.test.path">
+--- a/ant/js.xml
++++ b/ant/js.xml
+@@ -35,8 +35,8 @@
+ <property name="src.js" location="${basedir}/src/js"/>
+
+ <path id="js.class.path">
+- <pathelement location="${preqs}/log4j-1.2.8.jar"/>
+- <pathelement location="${preqs}/ant-1.5.4.jar"/>
++ <pathelement location="${preqs}/log4j-1.2.jar"/>
++ <pathelement location="${preqs}/ant.jar"/>
+ <pathelement location="${preqs}/junit.jar"/>
+ <pathelement location="${preqs}/antlr.jar"/>
+ <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
+@@ -44,7 +44,7 @@
+
+ <path id="js.test.path">
+ <path refid="js.class.path"/>
+- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
++ <pathelement location="${preqs}/hsqldb1.8.0.jar"/>
+ <pathelement location="${dist}/jaxmejs-${version}.jar"/>
+ <pathelement location="${build.js.test.classes}"/>
+ </path>
+@@ -62,7 +62,7 @@
+ <target name="JS.antlr" depends="dirs">
+ <java classname="antlr.Tool" failonerror="true">
+ <classpath>
+- <pathelement location="${preqs}/antlr.jar"/>
++ <pathelement location="/usr/share/java/antlr.jar"/>
+ </classpath>
+ <arg line="-o ${build.js.src}/org/apache/ws/jaxme/js/jparser"/>
+ <arg file="${src.js}/org/apache/ws/jaxme/js/jparser/java15.g"/>
+--- a/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
++++ b/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+@@ -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");
+ }
++
++
++// 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();
++ }
+ }
+--- a/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
++++ b/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+@@ -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);
+ }
++
++
++// added to support JDK6
++
++ public Object unmarshal(Reader reader) throws JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public JAXBElement unmarshal(Node node, Class declaredType) throws
JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public JAXBElement unmarshal(Source source, Class declaredType) throws
JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Object unmarshal(XMLStreamReader reader) throws JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public JAXBElement unmarshal(XMLStreamReader reader, Class declaredType)
throws JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Object unmarshal(XMLEventReader reader) throws JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public JAXBElement unmarshal(XMLEventReader reader, Class declaredType)
throws JAXBException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSchema(Schema schema) {
++ throw new UnsupportedOperationException();
++ }
++
++ public Schema getSchema() {
++ 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 setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
++ throw new UnsupportedOperationException();
++ }
++
++ public AttachmentUnmarshaller getAttachmentUnmarshaller() {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setListener(Listener listener) {
++ throw new UnsupportedOperationException();
++ }
++
++ public Listener getListener() {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
++++ b/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
+@@ -556,7 +556,8 @@
+ marshaller.marshal(e, sw);
+ String got = sw.toString();
+ String expect = getAllElementString(false, pDateTimeFormat,
pDateFormat, pTimeFormat);
+- assertEquals(expect, got);
++ // Disabled due to timezone problems.
++ //assertEquals(expect, got);
+ }
+
+ private RootElementHandler getRootElementInfo(String pElement) throws
ParserConfigurationException, IOException, SAXException {
+--- a/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
++++ b/src/jaxme/org/apache/ws/jaxme/junit/WildcardTest.java
+@@ -88,9 +88,10 @@
+ }
+
+ public void testMarshalAnyAttribute() throws Exception {
+- String expect = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++ String expect1 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++ String expect2 = "<ex:AnyAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:p=\"foo\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ String got = getMarshalledAnyAttribute();
+- assertEquals(expect, got);
++ assertTrue(expect1.equals(got) || expect2.equals(got));
+ }
+
+ protected void assertEquals(WildcardAttribute[] pExpect,
WildcardAttribute[] pGot) {
+@@ -123,9 +124,10 @@
+ }
+
+ public void testMarshalListAttribute() throws Exception {
+- String expect = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
++ String expect1 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\"/>";
++ String expect2 = "<ex:ListAttribute p:foo=\"value 1\" ex:bar=\"value
2\" xmlns:p=\"http://ws.apache.org/jaxme/test/misc/wildcards/2\";
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ String got = getMarshalledListAttribute();
+- assertEquals(expect, got);
++ assertTrue(expect1.equals(got) || expect2.equals(got));
+ }
+
+ public void testUnmarshalListAttribute() throws Exception {
+@@ -138,9 +140,10 @@
+ }
+
+ public void testMarshalOtherAttribute() throws Exception {
+- String expect = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value 2\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"; xmlns:p=\"foo\"/>";
++ String expect1 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value
2\" xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\";
xmlns:p=\"foo\"/>";
++ String expect2 = "<ex:OtherAttribute p:bar=\"value 1\" baz=\"value
2\" xmlns:p=\"foo\"
xmlns:ex=\"http://ws.apache.org/jaxme/test/misc/wildcards\"/>";
+ String got = getMarshalledOtherAttribute();
+- assertEquals(expect, got);
++ assertTrue(expect1.equals(got) || expect2.equals(got));
+ }
+
+ public void testUnmarshalOtherAttribute() throws Exception {
+--- a/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
++++ b/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java
+@@ -17,9 +17,7 @@
+ package org.apache.ws.jaxme.util;
+
+ 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 +35,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()).encode(pValue));
+ }
+ }
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
