← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openjdk-6/lucid-updates

« back to all changes in this revision

Viewing changes to patches/ecj/icedtea-jaxws-getdtdtype.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-03-10 11:19:19 UTC
  • mfrom: (3.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100310111919-o4i1uzfhj04xs0e7
Tags: 6b18~pre2-1
http://bugs.debian.org/573026
http://bugs.debian.org/572511
http://bugs.debian.org/567899
* Update IcedTea build infrastructure (20100310).
* Disable building the plugin the plugin on alpha (borked xulrunner
  packaging using binary indep packages).
* Use a two stage build on alpha.
* Add note about the reparenting WM workaround. Closes: #573026.
* Prefer Sazanami instead of Kochi for Japanese fonts (Hideki Yamane).
  Closes: #572511.
* openjdk-6-doc: Don't compress package-list files. Closes: #567899.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/ecj/icedtea-jaxws-getdtdtype.patch
 
1
diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties
 
2
--- openjdk-ecj.orig/jaxws/build.properties     2010-03-01 15:13:38.000000000 +0000
 
3
+++ openjdk-ecj/jaxws/build.properties  2010-03-01 15:14:30.000000000 +0000
 
4
@@ -81,7 +81,7 @@
 
5
 patches.dir=patches
 
6
 
 
7
 # Patches to apply
 
8
-jaxws_src.patch.list=xjc.patch
 
9
+jaxws_src.patch.list=xjc.patch getdtdtype.patch
 
10
 
 
11
 # Sanity information
 
12
 sanity.info= Sanity Settings:${line.separator}\
 
13
diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch
 
14
--- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch   1970-01-01 01:00:00.000000000 +0100
 
15
+++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch        2010-03-01 15:15:10.000000000 +0000
 
16
@@ -0,0 +1,27 @@
 
17
+--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java      2009-11-17 16:37:06.000000000 +0000
 
18
++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java      2009-11-17 16:38:00.000000000 +0000
 
19
+@@ -276,7 +276,7 @@
 
20
+                 qName = localName;
 
21
+             else
 
22
+                 qName = prefix + ':' + localName;
 
23
+-            String type = staxAttr.getDTDType();
 
24
+             String value = staxAttr.getValue();
 
25
+ 
 
26
+             attrs.addAttribute(uri, localName, qName, type, value);
 
27
+--- src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old    2009-11-17 19:46:11.000000000 +0000
 
28
++++ src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java        2009-11-17 19:46:35.000000000 +0000
 
29
+@@ -108,11 +108,10 @@
 
30
+    * the String "CDATA"
 
31
+    * @return the type as a String, default is "CDATA"
 
32
+    */
 
33
+-    public String getDTDType() {
 
34
+-        return _attributeType;
 
35
+     }
 
36
+ 
 
37
+-
 
38
+   /**
 
39
+    * A flag indicating whether this attribute was actually
 
40
+    * specified in the start-tag of its element, or was defaulted from the schema.