packages: java-jaxme/ant-scripts.patch (NEW), java-jaxme/bind-MANIFEST.MF (...
glen
glen at pld-linux.org
Sun Oct 23 16:03:59 CEST 2011
Author: glen Date: Sun Oct 23 14:03:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- new, from fedora package
---- Files affected:
packages/java-jaxme:
ant-scripts.patch (NONE -> 1.1) (NEW), bind-MANIFEST.MF (NONE -> 1.1) (NEW), catalog.patch (NONE -> 1.1) (NEW), docs_xml.patch (NONE -> 1.1) (NEW), java-jaxme.spec (NONE -> 1.1) (NEW), jdk16.patch (NONE -> 1.1) (NEW), system-dtd.patch (NONE -> 1.1) (NEW), use-commons-codec.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/java-jaxme/ant-scripts.patch
diff -u /dev/null packages/java-jaxme/ant-scripts.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/ant-scripts.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,92 @@
+--- ./ant/js.xml.sav 2005-08-12 03:39:29.000000000 -0400
++++ ./ant/js.xml 2007-02-12 12:31:25.000000000 -0500
+@@ -34,15 +34,15 @@
+ <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.jar"/>
++ <pathelement location="${preqs}/ant.jar"/>
+ <pathelement location="${preqs}/junit.jar"/>
+ <pathelement location="${preqs}/antlr.jar"/>
+ </path>
+
+ <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>
+@@ -129,6 +129,7 @@
+ </target>
+
+ <target name="JS.generate.version" depends="JS.generate.db">
++
+ <versionGenerator
+ driver="${jdbc.driver}"
+ url="${jdbc.url}"
+--- ./ant/pm.xml.sav 2005-08-12 03:39:29.000000000 -0400
++++ ./ant/pm.xml 2007-02-12 12:31:25.000000000 -0500
+@@ -37,11 +37,11 @@
+ <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.jar"/>
+- <pathelement location="${preqs}/xercesImpl.jar"/>
+- <pathelement location="${preqs}/xmldb-api-20021118.jar"/>
++ <pathelement location="${preqs}/xml-commons-apis.jar"/>
++ <pathelement location="${preqs}/xerces-j2.jar"/>
++ <pathelement location="${preqs}/xmldb-api.jar"/>
+ <!-- These aren't in the CVS and aren't necessary for the build -->
+ <pathelement location="${preqs}/TaminoAPI4J.jar"/>
+ <pathelement location="${preqs}/TaminoJCA.jar"/>
+--- ./ant/jm.xml.sav 2005-08-12 03:39:29.000000000 -0400
++++ ./ant/jm.xml 2007-02-12 12:31:41.000000000 -0500
+@@ -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.jar"/>
++ <pathelement location="${preqs}/xml-commons-apis.jar"/>
+ <pathelement location="${preqs}/beaver.jar"/>
+ <pathelement location="${preqs}/antlr.jar"/>
++ <pathelement location="${preqs}/commons-codec.jar"/>
+ </path>
+
+ <path id="jaxme.test.path">
+--- ./ant/xs.xml.sav 2005-08-12 03:39:29.000000000 -0400
++++ ./ant/xs.xml 2007-02-12 12:31:25.000000000 -0500
+@@ -23,7 +23,7 @@
+ <property name="src.xs" location="${basedir}/src/xs"/>
+
+ <path id="xs.class.path">
+- <pathelement location="${preqs}/xml-apis.jar"/>
++ <pathelement location="${preqs}/xml-commons-apis.jar"/>
+ <pathelement location="${preqs}/junit.jar"/>
+ <pathelement location="${dist}/jaxmeapi-${version}.jar"/>
+ </path>
+@@ -48,7 +48,7 @@
+ <path id="xs.test.path">
+ <path refid="xs.class.path"/>
+ <pathelement location="${dist}/jaxmexs-${version}.jar"/>
+- <pathelement location="${preqs}/xercesImpl.jar"/>
++ <pathelement location="${preqs}/xerces-j2.jar"/>
+ </path>
+ <runtests reportsdir="${build.xs.reports}" classpathref="xs.test.path">
+ <tests>
+--- ./ant/api.xml.sav 2005-08-12 03:39:29.000000000 -0400
++++ ./ant/api.xml 2007-02-12 12:31:25.000000000 -0500
+@@ -25,7 +25,7 @@
+ </target>
+
+ <path id="api.class.path">
+- <pathelement location="${preqs}/xml-apis.jar"/>
++ <pathelement location="${preqs}/xml-commons-apis.jar"/>
+ </path>
+
+ <target name="API.compile" depends="init">
================================================================
Index: packages/java-jaxme/bind-MANIFEST.MF
diff -u /dev/null packages/java-jaxme/bind-MANIFEST.MF:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/bind-MANIFEST.MF Sun Oct 23 16:03:53 2011
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: javax.xml.bind
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Version: 2.0.0.v20080604-1500
+Bundle-Vendor: %providerName
+Export-Package: javax.xml.bind;version="2.0.0",javax.xml.bind.annotati
+ on;version="2.0.0",javax.xml.bind.annotation.adapters;version="2.0.0"
+ ,javax.xml.bind.attachment;version="2.0.0",javax.xml.bind.helpers;ver
+ sion="2.0.0",javax.xml.bind.util;version="2.0.0"
================================================================
Index: packages/java-jaxme/catalog.patch
diff -u /dev/null packages/java-jaxme/catalog.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/catalog.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,29 @@
+--- ./ant/docs.xml.sav 2006-05-19 20:00:29.000000000 -0400
++++ ./ant/docs.xml 2006-05-19 20:01:01.000000000 -0400
+@@ -165,7 +165,9 @@
+ force="${force}"
+ style="${docbookxsl.home}/html/chunk.xsl">
+ <xmlcatalog>
+- <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
++ <catalogpath>
++ <pathelement location="/usr/share/sgml/docbook/xmlcatalog"/>
++ </catalogpath>
+ </xmlcatalog>
+ </style>
+ </target>
+@@ -180,10 +182,12 @@
+ force="${force}"
+ style="${docbookxsl.home}/html/chunk.xsl">
+ <xmlcatalog>
+- <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
++ <catalogpath>
++ <pathelement location="/usr/share/sgml/docbook/xmlcatalog"/>
++ </catalogpath>
+ </xmlcatalog>
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
+ </style>
+ </target>
+ </project>
+-
+\ No newline at end of file
++
================================================================
Index: packages/java-jaxme/docs_xml.patch
diff -u /dev/null packages/java-jaxme/docs_xml.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/docs_xml.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,11 @@
+--- ./ant/docs.xml.sav 2006-05-19 19:59:02.000000000 -0400
++++ ./ant/docs.xml 2006-05-19 19:59:07.000000000 -0400
+@@ -69,7 +69,7 @@
+ <fail>Missing DocBook, terminating.</fail>
+ </target>
+
+- <target name="Docs.all" depends="javadoc,docbook.html,old.releases,forrest,replace"
++ <target name="Docs.all" depends="javadoc,docbook.html,old.releases"
+ description="Generates the documentation"/>
+
+ <target name="javadoc" depends="all"
================================================================
Index: packages/java-jaxme/java-jaxme.spec
diff -u /dev/null packages/java-jaxme/java-jaxme.spec:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/java-jaxme.spec Sun Oct 23 16:03:53 2011
@@ -0,0 +1,179 @@
+# $Revision$, $Date$
+# TODO
+# - fix javadoc
+# java.lang.ClassNotFoundException: org.apache.tools.ant.taskdefs.optional.TraXLiaison
+#
+# Conditional build:
+%bcond_with javadoc # don't build javadoc
+
+%define srcname jaxme
+Summary: Open source implementation of JAXB
+Name: java-%{srcname}
+Version: 0.5.1
+Release: 1
+License: ASL 2.0
+Group: Development/Languages/Java
+URL: http://ws.apache.org/jaxme/
+# svn export http://svn.apache.org/repos/asf/webservices/jaxme/tags/R0_5_1/ ws-jaxme-0.5.1
+# tar czf ws-jaxme-0.5.1-src.tar.gz ws-jaxme
+Source0: ws-jaxme-%{version}-src.tar.gz
+# Source0-md5: 9709c7fb68880d494c3c347c3faa74c8
+Source1: bind-MANIFEST.MF
+# generated docs with forrest-0.5.1
+Patch0: docs_xml.patch
+Patch1: catalog.patch
+Patch2: system-dtd.patch
+Patch3: jdk16.patch
+Patch4: ant-scripts.patch
+Patch5: use-commons-codec.patch
+BuildRequires: ant >= 1.6
+BuildRequires: ant-apache-resolver
+BuildRequires: ant-nodeps >= 1.6
+BuildRequires: antlr
+BuildRequires: docbook-dtd45-xml
+BuildRequires: docbook-style-xsl
+BuildRequires: java(jaxp_parser_impl)
+BuildRequires: java(jaxp_transform_impl)
+BuildRequires: java-commons-codec
+BuildRequires: java-hsqldb
+BuildRequires: java-junit
+BuildRequires: java-log4j
+BuildRequires: java-xalan
+BuildRequires: java-xml-commons
+BuildRequires: java-xml-commons-resolver
+BuildRequires: java-xmldb
+BuildRequires: java-xmldb-sdk
+BuildRequires: jdk >= 1.6
+BuildRequires: jpackage-utils >= 1.6
+BuildRequires: rpmbuild(macros) >= 1.300
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires: glibc-localedb-all
+%endif
+Requires: antlr
+Requires: java(jaxp_parser_impl)
+Requires: java(jaxp_transform_impl)
+Requires: java-commons-codec
+Requires: java-hsqldb
+Requires: java-junit
+Requires: java-log4j
+Requires: java-xalan
+Requires: java-xml-commons
+Requires: java-xmldb
+Requires: java-xmldb-sdk
+Requires: jpackage-utils
+Obsoletes: ws-jaxme
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+A Java/XML binding compiler takes as input a schema description (in
+most cases an XML schema, but it may be a DTD, a RelaxNG schema, a
+Java class inspected via reflection, or a database schema). The output
+is a set of Java classes:
+- A Java bean class matching the schema description. (If the schema
+ was obtained via Java reflection, the original Java bean class.)
+- Read a conforming XML document and convert it into the equivalent
+ Java bean.
+- Vice versa, marshal the Java bean back into the original XML
+ document.
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%package manual
+Summary: Documents for %{name}
+Group: Documentation
+
+%description manual
+%{summary}.
+
+%prep
+%setup -q -n ws-%{srcname}
+find -name "*.jar" | xargs rm -v
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p0
+%patch5 -p0
+
+DOCBOOKX_DTD=$(%{_bindir}/xmlcatalog /usr/share/sgml/docbook/xml-dtd-4.5/catalog.xml "-//OASIS//DTD DocBook XML V4.5//EN")
+%{__sed} -i -e 's|@DOCBOOKX_DTD@|$DOCBOOKX_DTD|' src/documentation/manual/jaxme2.xml
+
+%build
+# source code not US-ASCII
+export LC_ALL=en_US
+
+export OPT_JAR_LIST="xalan-j2 ant/ant-nodeps xalan-j2-serializer xml-commons-resolver ant/ant-apache-resolver"
+# FIXME: xml-commons-jaxp-1.3-apis we can't solve
+CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xmldb xerces-j2)
+
+%ant all %{?with_javadoc:Docs.all} \
+ -Dbuild.sysclasspath=first \
+ -Ddocbook.home=%{_datadir}/sgml/docbook \
+ -Ddocbookxsl.home=%{_datadir}/sgml/docbook/xsl-stylesheets
+
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u dist/jaxmeapi-%{version}.jar META-INF/MANIFEST.MF
+
+%if %{with javadoc}
+rm -rf apidocs
+mv build/docs/src/documentation/content/apidocs .
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}/%{srcname}
+
+for jar in dist/*.jar; do
+ cp -p $jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}
+done
+
+# create unversioned symlinks
+for a in $RPM_BUILD_ROOT%{_javadir}/%{srcname}/*.jar; do
+ jar=${a##*/}
+ ln -s $jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}/${jar%%-%{version}.jar}.jar
+done
+
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc LICENSE
+%{_javadir}/%{srcname}
+
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+%files manual
+%defattr(644,root,root,755)
+%doc build/docs/src/documentation/content/*
+%endif
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/10/23 14:03:53 glen
+- new, from fedora package
================================================================
Index: packages/java-jaxme/jdk16.patch
diff -u /dev/null packages/java-jaxme/jdk16.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/jdk16.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,176 @@
+--- ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java.orig 2008-07-08 11:31:43.000000000 -0400
++++ ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java 2008-07-09 05:54:23.000000000 -0400
+@@ -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();
++ }
+ }
+--- ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java.orig 2008-07-08 11:34:58.000000000 -0400
++++ ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java 2008-07-09 05:52:39.000000000 -0400
+@@ -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();
++ }
+ }
================================================================
Index: packages/java-jaxme/system-dtd.patch
diff -u /dev/null packages/java-jaxme/system-dtd.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/system-dtd.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,11 @@
+--- ws-jaxme/src/documentation/manual/jaxme2.xml.orig 2008-08-15 13:21:21.882649810 -0400
++++ ws-jaxme/src/documentation/manual/jaxme2.xml 2008-08-15 13:21:44.684648635 -0400
+@@ -17,7 +17,7 @@
+
+ -->
+ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
++ "@DOCBOOKX_DTD@" [
+ <!ENTITY address SYSTEM "address.xml">
+ <!ENTITY addressxsd SYSTEM "addressxsd.xml">
+ <!ENTITY faq SYSTEM "faq.xml">
================================================================
Index: packages/java-jaxme/use-commons-codec.patch
diff -u /dev/null packages/java-jaxme/use-commons-codec.patch:1.1
--- /dev/null Sun Oct 23 16:03:59 2011
+++ packages/java-jaxme/use-commons-codec.patch Sun Oct 23 16:03:53 2011
@@ -0,0 +1,28 @@
+--- ./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));
+ }
+ }
================================================================
More information about the pld-cvs-commit
mailing list