/hg/icedtea6: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 1 07:20:45 PST 2010
changeset 917e99004afb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=917e99004afb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 01 13:51:34 2010 +0000
Don't add tools.jar to bootclasspath; now a symlink to rt.jar.
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea.patch: Don't add tools.jar to
bootclasspath; now just a symlink to rt.jar.
changeset 2eb60c97dd3c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2eb60c97dd3c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 01 14:31:42 2010 +0000
Patch the JAXWS source if getDTDType() has the wrong return type
(gcj 4.3 and earlier)
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (stamps/extract.stamp): Add meta
extract target to pull in both extract-openjdk and extract-
jaxws. (stamps/extract-openjdk.stamp): Rename stamp file
to extract-openjdk.stamp. (clean-extract-jaxws): Remove
jaxws sources.
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Make use of JAXWS dependent on
absence of getDTDType() bug. Add new JAXWS patch.
(extract-jaxws.stamp): Apply getDTDType() patch if bug
found.
* acinclude.m4: (IT_GETDTDTYPE_CHECK): Check for old versions
of gcj/Classpath which have
javax.xml.stream.events.Attribute.getDTDType() with a return
type of QName not String.
* configure.ac: Invoke new IT_GETDTDTYPE_CHECK macro.
* patches/icedtea-jaxws-getdtdtype.patch: New patch to work
around the getDTDType() bug.
changeset 3f0dcd8de43f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3f0dcd8de43f
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:49:20 2009 +0000
Add additional JAXWS gcj 4.3 fix for AttributeBase.java
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea-jaxws-getdtdtype.patch: Add
additional fix for AttributeBase.java
changeset 7110db4670d3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7110db4670d3
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 21:35:00 2009 +0000
Make the AttributeBase fix actually compile...
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea-jaxws-getdtdtype.patch:
Replace getDTDType method, don't add another.
* HACKING: Document the patch.
changeset 278ade392786 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=278ade392786
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 01 15:20:29 2010 +0000
Simplify JAXWS patching for OpenJDK6.
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
Simply JAXWS patching for OpenJDK6.
* Makefile.am, (NEED_JAXWS_SRC): Removed.
(JAXWS_PATCHES): Removed. (ICEDTEA_ENV_ECJ): Add getdtdtype
patch. (extract.stamp): Remove extract-jaxws dependency.
(clean-extract): Remove clean-extract-jaxws dependency.
(extract-jaxws.stamp): Removed. (clean-extract-jaxws):
Removed.
* patches/ecj/icedtea-jaxws-getdtdtype.patch: Updated to apply
to JAXWS tree as a patch.
diffstat:
8 files changed, 186 insertions(+), 8 deletions(-)
ChangeLog | 55 ++++++++++++++++++++
Makefile.am | 20 +++++--
String | 11 ++++
acinclude.m4 | 74 ++++++++++++++++++++++++++++
configure.ac | 1
patches/ecj/icedtea-jaxws-getdtdtype.patch | 23 ++++++++
patches/ecj/icedtea.patch | 4 -
return | 6 ++
diffs (276 lines):
diff -r 7c740ee6ff74 -r 278ade392786 ChangeLog
--- a/ChangeLog Mon Mar 01 09:41:01 2010 +0100
+++ b/ChangeLog Mon Mar 01 15:20:29 2010 +0000
@@ -1,3 +1,58 @@ 2010-03-01 Mark Wielaard <mark at klomp.o
+2010-03-01 Andrew John Hughes <ahughes at redhat.com>
+
+ Simply JAXWS patching for OpenJDK6.
+ * Makefile.am,
+ (NEED_JAXWS_SRC): Removed.
+ (JAXWS_PATCHES): Removed.
+ (ICEDTEA_ENV_ECJ): Add getdtdtype patch.
+ (extract.stamp): Remove extract-jaxws dependency.
+ (clean-extract): Remove clean-extract-jaxws dependency.
+ (extract-jaxws.stamp): Removed.
+ (clean-extract-jaxws): Removed.
+ * patches/ecj/icedtea-jaxws-getdtdtype.patch:
+ Updated to apply to JAXWS tree as a patch.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/icedtea-jaxws-getdtdtype.patch:
+ Replace getDTDType method, don't add another.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/icedtea-jaxws-getdtdtype.patch:
+ Add additional fix for AttributeBase.java
+
+2010-03-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (stamps/extract.stamp): Add meta extract target
+ to pull in both extract-openjdk and extract-jaxws.
+ (stamps/extract-openjdk.stamp): Rename stamp file
+ to extract-openjdk.stamp.
+ (clean-extract-jaxws): Remove jaxws sources.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Make use of JAXWS dependent on absence of
+ getDTDType() bug. Add new JAXWS patch.
+ (extract-jaxws.stamp): Apply getDTDType() patch
+ if bug found.
+ * acinclude.m4:
+ (IT_GETDTDTYPE_CHECK): Check for old versions of
+ gcj/Classpath which have
+ javax.xml.stream.events.Attribute.getDTDType()
+ with a return type of QName not String.
+ * configure.ac:
+ Invoke new IT_GETDTDTYPE_CHECK macro.
+ * patches/icedtea-jaxws-getdtdtype.patch:
+ New patch to work around the getDTDType() bug.
+
+2010-03-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/icedtea.patch: Don't add tools.jar
+ to bootclasspath; now just a symlink to rt.jar.
+
2010-03-01 Mark Wielaard <mark at klomp.org>
* patches/ecj/icedtea.patch: Don't add generated dir to
diff -r 7c740ee6ff74 -r 278ade392786 Makefile.am
--- a/Makefile.am Mon Mar 01 09:41:01 2010 +0100
+++ b/Makefile.am Mon Mar 01 15:20:29 2010 +0000
@@ -61,7 +61,6 @@ LANGTOOLS = openjdk/langtools/src/share/
LANGTOOLS = openjdk/langtools/src/share/classes
JAXP = openjdk/jaxp/src/share/classes
CORBA = openjdk/corba/src/share/classes
-JAXWS = openjdk/jaxws/src/share/classes
# FIXME (netx): NetX source directories go here
@@ -580,6 +579,11 @@ ICEDTEA_ENV_ECJ += \
RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
endif
+if DTDTYPE_QNAME
+ICEDTEA_ENV_ECJ += \
+ patches/ecj/icedtea-jaxws-getdtdtype.patch
+endif
+
# Source files
# FIXME (distclean): Add generated file list
# FIXME (distclean): Add jtreg sources
@@ -894,7 +898,14 @@ endif
endif
#FIXME (meta): Split into multiple targets
-stamps/extract.stamp: stamps/download.stamp
+stamps/extract.stamp: stamps/extract-openjdk.stamp \
+ mkdir -p stamps
+ touch $@
+
+clean-extract:
+ rm -f stamps/extract.stamp
+
+stamps/extract-openjdk.stamp: stamps/download.stamp
if OPENJDK_SRC_DIR_FOUND
cp -a $(OPENJDK_SRC_DIR) openjdk
else
@@ -949,10 +960,7 @@ endif
-o -type d -exec chmod 750 '{}' ';'; \
fi
mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
+ touch stamps/extract-openjdk.stamp
stamps/replace-hotspot.stamp: stamps/extract.stamp
if WITH_ALT_HSBUILD
diff -r 7c740ee6ff74 -r 278ade392786 acinclude.m4
--- a/acinclude.m4 Mon Mar 01 09:41:01 2010 +0100
+++ b/acinclude.m4 Mon Mar 01 15:20:29 2010 +0000
@@ -1244,6 +1244,80 @@ AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESS
AC_PROVIDE([$0])dnl
])
+AC_DEFUN([IT_GETDTDTYPE_CHECK],[
+ AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.EndElement;
+import javax.xml.stream.events.StartElement;
+
+import java.lang.reflect.Method;
+
+public class Test
+ implements Attribute
+{
+ // This method will not qualify if using an
+ // old version of Classpath where it returns
+ // a QName.
+ public String getDTDType() { return "Boom"; }
+
+ // Other Attribute methods
+ public QName getName() { return null; }
+ public String getValue() { return "Bang"; }
+ public boolean isSpecified() { return false; }
+
+ // XMLEvent methods
+ public Characters asCharacters() { return null; }
+ public EndElement asEndElement() { return null; }
+ public StartElement asStartElement() { return null; }
+ public int getEventType() { return 42; }
+ public Location getLocation() { return null; }
+ public QName getSchemaType() { return null; }
+ public boolean isAttribute() { return true; }
+ public boolean isCharacters() { return false; }
+ public boolean isEndDocument() { return false; }
+ public boolean isEndElement() { return false; }
+ public boolean isEntityReference() { return false; }
+ public boolean isNamespace() { return false; }
+ public boolean isProcessingInstruction() { return false; }
+ public boolean isStartDocument() { return false; }
+ public boolean isStartElement() { return false; }
+ public void writeAsEncodedUnicode(java.io.Writer w) {}
+
+ public static void main(String[] args)
+ {
+ for (Method m : Attribute.class.getMethods())
+ if (m.getName().equals("getDTDType"))
+ if (m.getReturnType().equals(QName.class))
+ System.exit(1);
+ }
+}]
+EOF
+ if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_dtdtype=no;
+ else
+ it_cv_dtdtype=yes;
+ fi
+ else
+ it_cv_dtdtype=yes;
+ fi
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+ ])
+AM_CONDITIONAL([DTDTYPE_QNAME], test x"${it_cv_dtdtype}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
# Provides the option --with-parallel-jobs
# * --with-parallel-jobs; use jobs=processors + 1
# * --with-parallel-jobs=x; use jobs=x
diff -r 7c740ee6ff74 -r 278ade392786 configure.ac
--- a/configure.ac Mon Mar 01 09:41:01 2010 +0100
+++ b/configure.ac Mon Mar 01 15:20:29 2010 +0000
@@ -204,6 +204,7 @@ AC_CHECK_WITH_HG_REVISION
AC_CHECK_WITH_HG_REVISION
AC_CHECK_WITH_TZDATA_DIR
IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
+IT_GETDTDTYPE_CHECK
IT_CHECK_XULRUNNER_VERSION
if test "x${enable_visualvm}" = "xyes"
diff -r 7c740ee6ff74 -r 278ade392786 patches/ecj/icedtea-jaxws-getdtdtype.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-jaxws-getdtdtype.patch Mon Mar 01 15:20:29 2010 +0000
@@ -0,0 +1,43 @@
+diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties
+--- openjdk-ecj.orig/jaxws/build.properties 2010-03-01 15:13:38.000000000 +0000
++++ openjdk-ecj/jaxws/build.properties 2010-03-01 15:14:30.000000000 +0000
+@@ -81,7 +81,7 @@
+ patches.dir=patches
+
+ # Patches to apply
+-jaxws_src.patch.list=xjc.patch
++jaxws_src.patch.list=xjc.patch getdtdtype.patch
+
+ # Sanity information
+ sanity.info= Sanity Settings:${line.separator}\
+diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch
+--- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch 1970-01-01 01:00:00.000000000 +0100
++++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2010-03-01 15:15:10.000000000 +0000
+@@ -0,0 +1,27 @@
++--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000
+++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000
++@@ -276,7 +276,7 @@
++ qName = localName;
++ else
++ qName = prefix + ':' + localName;
++- String type = staxAttr.getDTDType();
+++ String type = staxAttr.getDTDType().toString();
++ String value = staxAttr.getValue();
++
++ attrs.addAttribute(uri, localName, qName, type, value);
++--- src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000
+++++ src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000
++@@ -108,11 +108,10 @@
++ * the String "CDATA"
++ * @return the type as a String, default is "CDATA"
++ */
++- public String getDTDType() {
++- return _attributeType;
+++ public QName getDTDType() {
+++ return new QName(_attributeType);
++ }
++
++-
++ /**
++ * A flag indicating whether this attribute was actually
++ * specified in the start-tag of its element, or was defaulted from the schema.
diff -r 7c740ee6ff74 -r 278ade392786 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Mon Mar 01 09:41:01 2010 +0100
+++ b/patches/ecj/icedtea.patch Mon Mar 01 15:20:29 2010 +0000
@@ -902,7 +902,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
includeAntRuntime="no"
source="@{javac.source}"
target="@{javac.target}">
-+ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="-Xlint"/>
@@ -910,7 +910,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
target="@{javac.target}"
debug="${javac.debug}"
debuglevel="${javac.debuglevel}">
-+ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
More information about the distro-pkg-dev
mailing list