Author: twerner
Date: 2011-08-06 09:03:17 +0000 (Sat, 06 Aug 2011)
New Revision: 13993
Added:
trunk/jaxme/debian/patches/
trunk/jaxme/debian/patches/series
trunk/jaxme/debian/patches/upstream.diff
trunk/jaxme/debian/source/
trunk/jaxme/debian/source/format
Removed:
trunk/jaxme/debian/dirs
trunk/jaxme/debian/svn-deblayout
Modified:
trunk/jaxme/debian/changelog
trunk/jaxme/debian/control
Log:
* Team upload.
* Switch to source format 3.0.
* Add Depends: ${misc:Depends}.
* Remove Java runtime dependencies.
Modified: trunk/jaxme/debian/changelog
===================================================================
--- trunk/jaxme/debian/changelog 2011-08-06 08:57:05 UTC (rev 13992)
+++ trunk/jaxme/debian/changelog 2011-08-06 09:03:17 UTC (rev 13993)
@@ -1,3 +1,12 @@
+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 ]
Modified: trunk/jaxme/debian/control
===================================================================
--- trunk/jaxme/debian/control 2011-08-06 08:57:05 UTC (rev 13992)
+++ trunk/jaxme/debian/control 2011-08-06 09:03:17 UTC (rev 13993)
@@ -12,7 +12,7 @@
Package: libjaxme-java
Architecture: all
-Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless, liblog4j1.2-java, libcommons-codec-java
+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
@@ -28,6 +28,7 @@
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
Deleted: trunk/jaxme/debian/dirs
===================================================================
--- trunk/jaxme/debian/dirs 2011-08-06 08:57:05 UTC (rev 13992)
+++ trunk/jaxme/debian/dirs 2011-08-06 09:03:17 UTC (rev 13993)
@@ -1 +0,0 @@
-usr/share/java
Added: trunk/jaxme/debian/patches/series
===================================================================
--- trunk/jaxme/debian/patches/series (rev 0)
+++ trunk/jaxme/debian/patches/series 2011-08-06 09:03:17 UTC (rev 13993)
@@ -0,0 +1 @@
+upstream.diff
Added: trunk/jaxme/debian/patches/upstream.diff
===================================================================
--- trunk/jaxme/debian/patches/upstream.diff (rev 0)
+++ trunk/jaxme/debian/patches/upstream.diff 2011-08-06 09:03:17 UTC (rev
13993)
@@ -0,0 +1,363 @@
+--- 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));
+ }
+ }
Added: trunk/jaxme/debian/source/format
===================================================================
--- trunk/jaxme/debian/source/format (rev 0)
+++ trunk/jaxme/debian/source/format 2011-08-06 09:03:17 UTC (rev 13993)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/jaxme/debian/svn-deblayout
===================================================================
--- trunk/jaxme/debian/svn-deblayout 2011-08-06 08:57:05 UTC (rev 13992)
+++ trunk/jaxme/debian/svn-deblayout 2011-08-06 09:03:17 UTC (rev 13993)
@@ -1,2 +0,0 @@
-buildArea=../../build-area
-origDir=..
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
