summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/jaxme/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/jaxme/files')
-rw-r--r--dev-java/jaxme/files/jaxme-0.3.1-base64.diff36
-rw-r--r--dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch41
-rw-r--r--dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch24
3 files changed, 101 insertions, 0 deletions
diff --git a/dev-java/jaxme/files/jaxme-0.3.1-base64.diff b/dev-java/jaxme/files/jaxme-0.3.1-base64.diff
new file mode 100644
index 000000000000..b0475f9cb900
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.3.1-base64.diff
@@ -0,0 +1,36 @@
+--- ws-jaxme-0.3.1/buildjm.xml.orig 2006-07-30 18:46:21.000000000 +0200
++++ ws-jaxme-0.3.1/buildjm.xml 2006-07-30 19:04:24.000000000 +0200
+@@ -54,6 +54,7 @@
+ <pathelement location="${preqs}/ant.jar"/>
+ <pathelement location="${preqs}/xml-apis.jar"/>
+ <pathelement location="${preqs}/xercesImpl.jar"/>
++ <pathelement location="${preqs}/gnu-crypto.jar"/>
+ </path>
+
+ <path id="jaxme.runtime.path">
+--- ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.orig 2006-07-30 18:49:11.000000000 +0200
++++ ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java 2006-07-30 19:02:54.000000000 +0200
+@@ -18,8 +18,7 @@
+
+ import java.io.IOException;
+
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
++import gnu.crypto.util.Base64;
+
+
+ /**
+@@ -33,11 +32,11 @@
+ }
+
+ public static byte[] decode(String pValue) throws IOException {
+- return (new BASE64Decoder()).decodeBuffer(pValue);
++ return Base64.decode(pValue);
+ }
+
+ public static String encode(byte[] pValue) {
+- return (new BASE64Encoder()).encode(pValue);
++ return Base64.encode(pValue);
+ }
+
+ public static void main(String[] args) throws Exception {
diff --git a/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch b/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch
new file mode 100644
index 000000000000..c51a33c713c7
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch
@@ -0,0 +1,41 @@
+diff -ru ws-jaxme-0.3.1/build.xml ws-jaxme-0.3.1-patched/build.xml
+--- ws-jaxme-0.3.1/build.xml 2004-09-02 18:41:58.000000000 -0400
++++ ws-jaxme-0.3.1-patched/build.xml 2005-06-26 22:59:39.000000000 -0400
+@@ -157,9 +157,8 @@
+ <target name="doc" depends="javadoc,docbook.html,forrest,replace"
+ description="Generates the documentation"/>
+
+- <target name="javadoc" depends="init,all"
++ <target name="javadoc" depends="init"
+ description="Generates the API documentation">
+- <delete dir="${build.apidocs}"/>
+ <mkdir dir="${build.apidocs}"/>
+ <javadoc
+ access="protected"
+@@ -189,8 +188,8 @@
+ <pathelement location="${src.js}"/>
+ <pathelement location="${src.jm}"/>
+ <pathelement location="${src.pm}"/>
+- <pathelement location="${build.js.src}"/>
+- <pathelement location="${build.jm.src}"/>
++ <!--pathelement location="${build.js.src}"/>
++ <pathelement location="${build.jm.src}"/-->
+ </sourcepath>
+ </javadoc>
+ </target>
+@@ -245,6 +244,15 @@
+ <delete dir="${dist}"/>
+ </target>
+
++ <target name="jar">
++
++ <ant antfile="buildapi.xml" target="jar" inheritall="false" inheritrefs="false"/>
++ <ant antfile="buildxs.xml" target="jar" inheritall="false" inheritrefs="false"/>
++ <ant antfile="buildjs.xml" target="jar" inheritall="false" inheritrefs="false"/>
++ <ant antfile="buildjm.xml" target="compile" inheritall="false" inheritrefs="false"/>
++ <ant antfile="buildpm.xml" target="compile" inheritall="false" inheritrefs="false"/>
++ </target>
++
+ <target name="all">
+ <ant antfile="buildapi.xml" target="all" inheritall="false" inheritrefs="false"/>
+ <ant antfile="buildxs.xml" target="all" inheritall="false" inheritrefs="false"/>
diff --git a/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
new file mode 100644
index 000000000000..210a1783c783
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
@@ -0,0 +1,24 @@
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java 2005-03-10 12:14:08.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java 2009-04-05 00:43:39.498597962 +0300
+@@ -45,7 +45,7 @@
+ * @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
+ * @version $Id$
+ */
+-public class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
++public abstract class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
+ /** Default value for {@link Marshaller#JAXB_ENCODING}.
+ * (UTF-8 encoding)
+ */
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java 2005-03-04 12:41:53.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java 2009-04-05 00:43:53.635210800 +0300
+@@ -44,7 +44,7 @@
+
+ /** JaxMe's {@link javax.xml.bind.Unmarshaller} implementation.
+ */
+-public class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
++public abstract class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
+ private static final SAXParserFactory spf;
+ static {
+ spf = SAXParserFactory.newInstance();