diff options
Diffstat (limited to 'dev-java/xml-xmlbeans/files')
4 files changed, 271 insertions, 0 deletions
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch new file mode 100644 index 000000000000..8081f71775f6 --- /dev/null +++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch @@ -0,0 +1,64 @@ +diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java +--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java 2010-04-14 08:30:34.000000000 +0300 ++++ src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java 2012-09-05 23:03:48.617016181 +0300 +@@ -27,10 +27,10 @@ + import org.apache.xmlbeans.XmlError; + import org.apache.xmlbeans.InterfaceExtension; + import org.apache.xmlbeans.PrePostExtension; +-import org.apache.xmlbeans.impl.jam.JamClassLoader; +-import org.apache.xmlbeans.impl.jam.JamService; +-import org.apache.xmlbeans.impl.jam.JamServiceFactory; +-import org.apache.xmlbeans.impl.jam.JamServiceParams; ++import org.codehaus.jam.JamClassLoader; ++import org.codehaus.jam.JamService; ++import org.codehaus.jam.JamServiceFactory; ++import org.codehaus.jam.JamServiceParams; + import org.apache.xmlbeans.impl.schema.StscState; + + import javax.xml.namespace.QName; +diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java +--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java 2010-04-14 08:30:34.000000000 +0300 ++++ src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java 2012-09-05 23:09:00.320097542 +0300 +@@ -18,10 +18,10 @@ + import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig; + import org.apache.xmlbeans.InterfaceExtension; + import org.apache.xmlbeans.XmlObject; +-import org.apache.xmlbeans.impl.jam.JMethod; +-import org.apache.xmlbeans.impl.jam.JClass; +-import org.apache.xmlbeans.impl.jam.JParameter; +-import org.apache.xmlbeans.impl.jam.JamClassLoader; ++import org.codehaus.jam.JMethod; ++import org.codehaus.jam.JClass; ++import org.codehaus.jam.JParameter; ++import org.codehaus.jam.JamClassLoader; + + public class InterfaceExtensionImpl implements InterfaceExtension + { +diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java +--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java 2010-04-14 08:30:34.000000000 +0300 ++++ src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java 2012-09-05 23:06:48.081760004 +0300 +@@ -17,9 +17,9 @@ + + import org.apache.xmlbeans.XmlObject; + import org.apache.xmlbeans.PrePostExtension; +-import org.apache.xmlbeans.impl.jam.JamClassLoader; +-import org.apache.xmlbeans.impl.jam.JClass; +-import org.apache.xmlbeans.impl.jam.JMethod; ++import org.codehaus.jam.JamClassLoader; ++import org.codehaus.jam.JClass; ++import org.codehaus.jam.JMethod; + import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig; + + +diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java +--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java 2010-04-14 08:30:34.000000000 +0300 ++++ src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java 2012-09-05 23:06:33.710940667 +0300 +@@ -3,7 +3,7 @@ + import javax.xml.namespace.QName; + + import org.apache.xmlbeans.UserType; +-import org.apache.xmlbeans.impl.jam.JamClassLoader; ++import org.codehaus.jam.JamClassLoader; + import org.apache.xmlbeans.impl.xb.xmlconfig.Usertypeconfig; + + public class UserTypeImpl implements UserType diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch new file mode 100644 index 000000000000..866dc0f6ed53 --- /dev/null +++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch @@ -0,0 +1,14 @@ +diff -ur /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java src/store/org/apache/xmlbeans/impl/store/Locale.java +--- /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java 2012-09-05 14:31:47.743396340 +0300 ++++ src/store/org/apache/xmlbeans/impl/store/Locale.java 2012-09-05 14:35:31.527582989 +0300 +@@ -106,8 +106,8 @@ + import org.apache.xmlbeans.impl.values.TypeStoreUser; + import org.apache.xmlbeans.impl.values.TypeStoreUserFactory; + +-import org.apache.xmlbeans.impl.piccolo.xml.Piccolo; +-import org.apache.xmlbeans.impl.piccolo.io.FileFormatException; ++import com.bluecast.xml.Piccolo; ++import com.bluecast.io.FileFormatException; + + public final class Locale + implements DOMImplementation, SaajCallback, XmlLocale diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch new file mode 100644 index 000000000000..23467d2b24a6 --- /dev/null +++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch @@ -0,0 +1,37 @@ +--- a/build.xml ++++ b/build.xml +@@ -433,7 +433,6 @@ + <jar jarfile="build/private/xmlbeans-${version.base}${version.rc}-sources.jar" index="false"> + <fileset dir="src/common" includes="**/*.java"/> + <fileset dir="src/configschema" includes="**/*.java"/> +- <fileset dir="src/jamsupport" includes="**/*.java"/> + <fileset dir="src/marshal" includes="**/*.java"/> + <fileset dir="src/repackage" includes="**/*.java"/> + <fileset dir="src/saaj_api" includes="**/*.java"/> +@@ -488,7 +487,7 @@ + store.classes, saaj_api.classes, + marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes, + xmlinputstream.classes, resolver.jar, xbean_xpath.jar, +- piccolo.classes, tools.classes, jamsupport.classes"> ++ piccolo.classes, tools.classes"> + <jar jarfile="build/lib/xbean.jar" index="true"> + <fileset dir="build/classes/xmlpublic" + excludes="javax/**"/> +@@ -711,17 +710,6 @@ + </classpath> + </javac> + </target> +- +- +- <!-- support for running JAM under JDK1.5 ========================= --> +- +- <target name="jamsupport.classes" depends="dirs,jam.classes"> +- <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on"> +- <classpath id="jamsupport.compile.path"> +- <pathelement location="build/classes/jam"/> +- </classpath> +- </javac> +- </target> + + <!-- saaj_api target ============================================== --> + diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch new file mode 100644 index 000000000000..9f3a7656fd2f --- /dev/null +++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch @@ -0,0 +1,156 @@ +diff -uprN xml-xmlbeans-20041217.orig/v1/build.xml xml-xmlbeans-20041217/v1/build.xml +--- xml-xmlbeans-20041217.orig/v1/build.xml 2004-12-24 13:27:42.347587336 +0100 ++++ xml-xmlbeans-20041217/v1/build.xml 2004-12-24 13:35:28.859666720 +0100 +@@ -340,7 +340,7 @@ + srcdir="test/src/drt" + destdir="build/private/classes/drt" + classpathref="test.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"/> + </target> + +@@ -372,7 +372,7 @@ + + <target name="soaptest.classes" depends="dirs, stsschema.jar"> + <mkdir dir="build/private/classes/soaptest"/> +- <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" debug="on"> ++ <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="external/lib/jdom.jar"/> + <pathelement location="external/lib/junit.jar"/> +@@ -395,7 +395,7 @@ + srcdir="test/src/erictest" + destdir="build/private/classes/erictest" + classpathref="test.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"/> + </target> + +@@ -411,7 +411,7 @@ + srcdir="test/src/random" + destdir="build/private/classes/random" + classpathref="test.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"/> + </target> + +@@ -423,7 +423,7 @@ + + <target name="teststore.classes" depends="dirs"> + <mkdir dir="build/private/classes/teststore"/> +- <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" debug="on"> ++ <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/private/classes/simpletypes"/> + <pathelement location="build/private/classes/xmlcomp"/> +@@ -557,7 +557,7 @@ + <property name="docs.dir" value="build/docs"/> + <delete dir="${docs.dir}"/> + <mkdir dir="${docs.dir}"/> +- <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" source="1.4" stylesheetfile="docs/stylesheet.css"> ++ <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" source="1.4" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" stylesheetfile="docs/stylesheet.css"> + <link href="http://xml.apache.org/xmlbeans/docs/reference/index.html"/> + <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/> + <link href="http://java.sun.com/j2ee/1.4/docs/api/"/> +@@ -583,7 +583,7 @@ + srcdir="test/src/streamtest" + destdir="build/private/classes/streamtest" + classpathref="test.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"/> + </target> + +@@ -736,7 +736,7 @@ + + <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes"> + <mkdir dir="build/classes/xmlpublic"/> +- <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" debug="on"> ++ <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/classes/xmlinputstream"/> + </classpath> +@@ -756,7 +756,7 @@ + + <target name="typestore.classes" depends="dirs, xmlpublic.classes, common.classes, xmlinputstream.classes"> + <mkdir dir="build/classes/typestore"/> +- <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" debug="on"> ++ <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/classes/xmlinputstream"/> + <pathelement location="build/classes/xmlpublic"/> +@@ -770,7 +770,7 @@ + + <target name="common.classes" depends="dirs, xmlpublic.jar, xmlinputstream.classes"> + <mkdir dir="build/classes/common"/> +- <javac srcdir="src/common" destdir="build/classes/common" source="1.4" debug="on"> ++ <javac srcdir="src/common" destdir="build/classes/common" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/classes/xmlinputstream"/> + <pathelement location="build/lib/xmlpublic.jar"/> +@@ -783,7 +783,7 @@ + + <target name="typeimpl.classes" depends="dirs, repackage.classes, xmlpublic.classes, typestore.classes, xsdschema.classes, configschema.classes, toolschema.classes"> + <mkdir dir="build/classes/typeimpl"/> +- <javac destdir="build/classes/typeimpl" source="1.4" debug="on"> ++ <javac destdir="build/classes/typeimpl" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/classes/xmlinputstream"/> + <pathelement location="build/classes/common"/> +@@ -816,7 +816,7 @@ + + <target name="xmlcomp.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes"> + <mkdir dir="build/classes/xmlcomp"/> +- <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" debug="on"> ++ <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/classes/xmlinputstream"/> + <pathelement location="build/classes/xmlpublic"/> +@@ -837,7 +837,7 @@ + <target name="xmlstore.classes" + depends="dirs, common.classes, typestore.classes, xmlpublic.classes"> + <mkdir dir="build/classes/xmlstore"/> +- <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" debug="on"> ++ <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" target="1.4" debug="on"> + <classpath id="xmlstore.compile.path"> + <pathelement location="build/classes/xmlinputstream"/> + <pathelement location="build/classes/typestore"/> +@@ -916,7 +916,7 @@ + + <target name="xmlconfig.classes" depends="dirs, xmlpublic.jar, configschema.classes"> + <mkdir dir="build/classes/xmlconfig"/> +- <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" debug="on"> ++ <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" target="1.4" debug="on"> + <classpath> + <pathelement location="build/lib/xmlpublic.jar"/> + <pathelement location="build/classes/configschema"/> +@@ -1044,7 +1044,7 @@ + + <target name="repackage.classes"> + <mkdir dir="build/classes/repackage"/> +- <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" debug="on"/> ++ <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" target="1.4" debug="on"/> + </target> + + <target name="check.jaxen.jar"> +@@ -1068,7 +1068,7 @@ + srcdir="src/xpath" + destdir="build/private/classes/xpath" + classpathref="xpath.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"> + <classpath id="xpath.compile.path"> + <pathelement location="build/lib/xmlpublic.jar"/> +@@ -1090,7 +1090,7 @@ + srcdir="test/src/xpath" + destdir="build/private/classes/testxpath" + classpathref="testxpath.compile.path" +- source="1.4" ++ source="1.4" target="1.4" + debug="on"> + <classpath id="testxpath.compile.path"> + <pathelement location="build/lib/xmlpublic.jar"/> |