/hg/release/icedtea6-1.11: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 17 05:14:55 PDT 2013
changeset 82e17c1cd647 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=82e17c1cd647
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 11:26:25 2013 +0100
Update EXTRA_DIST following merge of THANKYOU into AUTHORS.
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(EXTRA_DIST): Remove THANKYOU.
changeset 1609660fb832 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=1609660fb832
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 11:44:19 2013 +0100
Fix all paths to reference openjdk.
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
* patches/openjdk/jaxp144_05.patch:
Fix all paths to reference openjdk tree.
changeset 0a85944d1c12 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=0a85944d1c12
author: Omair Majid <omajid at redhat.com>
date: Tue Apr 16 15:53:33 2013 -0400
Remove conflicting patch preventing build
2013-04-16 Omair Majid <omajid at redhat.com>
* patches/coverage-table.patch: Remove. Already included
in patches/openjdk/6886358-layout_update.patch.
* Makefile.am (ICEDTEA_PATCHES): Remove patch.
changeset f25e5db93976 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=f25e5db93976
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 11:49:33 2013 +0100
Merge
changeset 941b287668e4 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=941b287668e4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 13:12:46 2013 +0100
Added tag icedtea6-1.11.10 for changeset f25e5db93976
changeset 82628dc4d2d4 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=82628dc4d2d4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 13:14:23 2013 +0100
Improve listing for S8004987 and S8004994
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Improve listing for S8004987 and
S8004994, using descriptions buried in the
patch itself (found during release announcement).
diffstat:
.hgtags | 1 +
ChangeLog | 23 +
Makefile.am | 4 +-
NEWS | 4 +-
patches/coverage-table.patch | 13 -
patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 5376 +++++++++---------
patches/openjdk/jaxp144_05.patch | 3926 ++++++------
7 files changed, 4678 insertions(+), 4669 deletions(-)
diffs (truncated from 41921 to 500 lines):
diff -r ed783f8e0c51 -r 82628dc4d2d4 .hgtags
--- a/.hgtags Wed Apr 17 09:37:04 2013 +0100
+++ b/.hgtags Wed Apr 17 13:14:23 2013 +0100
@@ -32,3 +32,4 @@
ae00216847f46fa26899a5317b75ea07edd5cb19 icedtea6-1.11.7
c529222b0628a112d53bfe3dafa7292df9d6e683 icedtea6-1.11.8
4892e006b2951600c9131e595096f8eceae5ffe8 icedtea6-1.11.9
+f25e5db9397688f7268bb62aca5c63520b4bd08e icedtea6-1.11.10
diff -r ed783f8e0c51 -r 82628dc4d2d4 ChangeLog
--- a/ChangeLog Wed Apr 17 09:37:04 2013 +0100
+++ b/ChangeLog Wed Apr 17 13:14:23 2013 +0100
@@ -1,3 +1,26 @@
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Improve listing for S8004987 and
+ S8004994, using descriptions buried in the
+ patch itself (found during release announcement).
+
+2013-04-16 Omair Majid <omajid at redhat.com>
+
+ * patches/coverage-table.patch: Remove. Already included
+ in patches/openjdk/6886358-layout_update.patch.
+ * Makefile.am (ICEDTEA_PATCHES): Remove patch.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
+ * patches/openjdk/jaxp144_05.patch:
+ Fix all paths to reference openjdk tree.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (EXTRA_DIST): Remove THANKYOU.
+
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add release date of 1.11.10.
diff -r ed783f8e0c51 -r 82628dc4d2d4 Makefile.am
--- a/Makefile.am Wed Apr 17 09:37:04 2013 +0100
+++ b/Makefile.am Wed Apr 17 13:14:23 2013 +0100
@@ -521,7 +521,6 @@
patches/openjdk/remove-mimpure-option-to-gcc.patch \
patches/idresolver_fix.patch \
patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
- patches/coverage-table.patch \
patches/openjdk/7185678-xmenuitem_peer_npe.patch \
patches/merge_fix.patch \
patches/openjdk/7175845-jar_uf_changes_file_permissions.patch \
@@ -757,8 +756,7 @@
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
- $(REWRITER_SRCS) \
- THANKYOU
+ $(REWRITER_SRCS)
# Top-Level Targets
# =================
diff -r ed783f8e0c51 -r 82628dc4d2d4 NEWS
--- a/NEWS Wed Apr 17 09:37:04 2013 +0100
+++ b/NEWS Wed Apr 17 13:14:23 2013 +0100
@@ -30,8 +30,8 @@
- S8004261: Improve input validation
- S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames
- S8004986, CVE-2013-2383: Better handling of glyph table
- - S8004987, CVE-2013-2384: Better handling of glyph table
- - S8004994, CVE-2013-1569: Better handling of glyph table
+ - S8004987, CVE-2013-2384: Improve font layout
+ - S8004994, CVE-2013-1569: Improve checking of glyph table
- S8005432: Update access to JAX-WS
- S8005943: (process) Improved Runtime.exec
- S8006309: More reliable control panel operation
diff -r ed783f8e0c51 -r 82628dc4d2d4 patches/coverage-table.patch
--- a/patches/coverage-table.patch Wed Apr 17 09:37:04 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- openjdk/jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2012-05-01 23:18:32.000000000 +0200
-+++ openjdk.orig/jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2012-05-30 13:05:52.000000000 +0200
-@@ -71,6 +71,10 @@
- le_uint16 probe = power;
- le_uint16 index = 0;
-
-+ if (count == 0) {
-+ return -1;
-+ }
-+
- if (SWAPW(glyphArray[extra]) <= ttGlyphID) {
- index = extra;
- }
diff -r ed783f8e0c51 -r 82628dc4d2d4 patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch
--- a/patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch Wed Apr 17 09:37:04 2013 +0100
+++ b/patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch Wed Apr 17 13:14:23 2013 +0100
@@ -5,7 +5,7 @@
# Parent 5c734e43475dca2ace97e0ac0dcfbed477c22825
Add contents of jdk6-jaf-b20.zip and jdk6-jaxws2_1_6-2011_06_13.zip
-diff --git a/drop_included/jaf_src/LICENSE b/drop_included/jaf_src/LICENSE
+diff --git a/drop_included/jaf_src/LICENSE openjdk/jaxws/drop_included/jaf_src/LICENSE
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/LICENSE
@@ -357,7 +357,7 @@
+ you modify this library, you may extend this exception to your version of
+ the library, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
-diff --git a/drop_included/jaf_src/src/META-INF/mailcap.default b/drop_included/jaf_src/src/META-INF/mailcap.default
+diff --git a/drop_included/jaf_src/src/META-INF/mailcap.default openjdk/jaxws/drop_included/jaf_src/src/META-INF/mailcap.default
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/META-INF/mailcap.default
@@ -369,7 +369,7 @@
+image/jpeg;; x-java-view=com.sun.activation.viewers.ImageViewer
+text/*;; x-java-view=com.sun.activation.viewers.TextViewer
+text/*;; x-java-edit=com.sun.activation.viewers.TextEditor
-diff --git a/drop_included/jaf_src/src/META-INF/mimetypes.default b/drop_included/jaf_src/src/META-INF/mimetypes.default
+diff --git a/drop_included/jaf_src/src/META-INF/mimetypes.default openjdk/jaxws/drop_included/jaf_src/src/META-INF/mimetypes.default
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/META-INF/mimetypes.default
@@ -398,7 +398,7 @@
+video/mpeg mpeg mpg mpe
+video/quicktime qt mov
+video/x-msvideo avi
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java b/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/LogSupport.java
@@ -473,7 +473,7 @@
+ return debug || logger.isLoggable(level);
+ }
+}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapFile.java
@@ -1041,7 +1041,7 @@
+ }
+ */
+}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapParseException.java
@@ -1086,7 +1086,7 @@
+ super(inInfo);
+ }
+}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java b/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MailcapTokenizer.java
@@ -1412,7 +1412,7 @@
+ }
+ */
+}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java b/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeEntry.java
@@ -1467,7 +1467,7 @@
+ return "MIMETypeEntry: " + type + ", " + extension;
+ }
+}
-diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java b/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
+diff --git a/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/com/sun/activation/registries/MimeTypeFile.java
@@ -1789,7 +1789,7 @@
+ stack.addElement(token);
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java b/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
+diff --git a/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/ActivationDataFlavor.java
@@ -2044,7 +2044,7 @@
+ return mimeType;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandInfo.java b/drop_included/jaf_src/src/javax/activation/CommandInfo.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandInfo.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandInfo.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandInfo.java
@@ -2187,7 +2187,7 @@
+ return new_bean;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandMap.java b/drop_included/jaf_src/src/javax/activation/CommandMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandMap.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandMap.java
@@ -2412,7 +2412,7 @@
+ return null;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/CommandObject.java b/drop_included/jaf_src/src/javax/activation/CommandObject.java
+diff --git a/drop_included/jaf_src/src/javax/activation/CommandObject.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandObject.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/CommandObject.java
@@ -2471,7 +2471,7 @@
+ public void setCommandContext(String verb, DataHandler dh)
+ throws IOException;
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandler.java b/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandler.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandler.java
@@ -2577,7 +2577,7 @@
+ public void writeTo(Object obj, String mimeType, OutputStream os)
+ throws IOException;
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java b/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataContentHandlerFactory.java
@@ -2630,7 +2630,7 @@
+ */
+ public DataContentHandler createDataContentHandler(String mimeType);
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataHandler.java b/drop_included/jaf_src/src/javax/activation/DataHandler.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataHandler.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataHandler.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataHandler.java
@@ -3529,7 +3529,7 @@
+ "no object DCH for MIME type " + this.mimeType);
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/DataSource.java b/drop_included/jaf_src/src/javax/activation/DataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/DataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataSource.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/DataSource.java
@@ -3620,7 +3620,7 @@
+ */
+ public String getName();
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/FileDataSource.java b/drop_included/jaf_src/src/javax/activation/FileDataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/FileDataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileDataSource.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileDataSource.java
@@ -3783,7 +3783,7 @@
+ typeMap = map;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/FileTypeMap.java b/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/FileTypeMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/FileTypeMap.java
@@ -3906,7 +3906,7 @@
+ return defaultMap;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java b/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MailcapCommandMap.java
@@ -4612,7 +4612,7 @@
+ }
+ */
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeType.java b/drop_included/jaf_src/src/javax/activation/MimeType.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeType.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeType.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeType.java
@@ -4961,7 +4961,7 @@
+ }
+ */
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java b/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParameterList.java
@@ -5305,7 +5305,7 @@
+ return buffer.toString();
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java b/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimeTypeParseException.java
@@ -5360,7 +5360,7 @@
+ super(s);
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java b/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
+diff --git a/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/MimetypesFileTypeMap.java
@@ -5701,7 +5701,7 @@
+ }
+ */
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/SecuritySupport.java b/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
+diff --git a/drop_included/jaf_src/src/javax/activation/SecuritySupport.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/SecuritySupport.java
@@ -5837,7 +5837,7 @@
+ }
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/URLDataSource.java b/drop_included/jaf_src/src/javax/activation/URLDataSource.java
+diff --git a/drop_included/jaf_src/src/javax/activation/URLDataSource.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/URLDataSource.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/URLDataSource.java
@@ -5979,7 +5979,7 @@
+ return url;
+ }
+}
-diff --git a/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java b/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
+diff --git a/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java openjdk/jaxws/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaf_src/src/javax/activation/UnsupportedDataTypeException.java
@@ -6041,7 +6041,7 @@
+ super(s);
+ }
+}
-diff --git a/drop_included/jaxws_src/LICENSE b/drop_included/jaxws_src/LICENSE
+diff --git a/drop_included/jaxws_src/LICENSE openjdk/jaxws/drop_included/jaxws_src/LICENSE
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/LICENSE
@@ -6393,7 +6393,7 @@
+ you modify this library, you may extend this exception to your version of
+ the library, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/ClassType.java
@@ -6446,7 +6446,7 @@
+ public static final ClassType ANNOTATION_TYPE_DECL = new ClassType("@interface");
+ public static final ClassType ENUM = new ClassType("enum");
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/CodeWriter.java
@@ -6554,7 +6554,7 @@
+ */
+ public abstract void close() throws IOException;
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotatable.java
@@ -6615,7 +6615,7 @@
+ */
+ <W extends JAnnotationWriter> W annotate2(Class<W> clazz);
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationArrayMember.java
@@ -6777,7 +6777,7 @@
+ f.nl().o().p('}');
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationStringValue.java
@@ -6831,7 +6831,7 @@
+ f.g(value);
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationUse.java
@@ -7126,7 +7126,7 @@
+ return memberValues.size()==1 && memberValues.containsKey("value");
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationValue.java
@@ -7165,7 +7165,7 @@
+ */
+public abstract class JAnnotationValue implements JGenerable {
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnnotationWriter.java
@@ -7223,7 +7223,7 @@
+ */
+ Class<A> getAnnotationType();
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAnonymousClass.java
@@ -7276,7 +7276,7 @@
+ return base.fullName();
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArray.java
@@ -7368,7 +7368,7 @@
+ }
+
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayClass.java
@@ -7495,7 +7495,7 @@
+ }
+
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JArrayCompRef.java
@@ -7571,7 +7571,7 @@
+ return JExpr.assignPlus(this,rhs);
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignment.java
@@ -7633,7 +7633,7 @@
+ }
+
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAssignmentTarget.java
@@ -7677,7 +7677,7 @@
+ JExpression assign(JExpression rhs);
+ JExpression assignPlus(JExpression rhs);
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JAtom.java
@@ -7725,7 +7725,7 @@
+ f.p(what);
+ }
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBlock.java
@@ -8185,7 +8185,7 @@
+ }
+
+}
-diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java b/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
+diff --git a/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
new file mode 100644
--- /dev/null
+++ openjdk/jaxws/drop_included/jaxws_src/src/com/sun/codemodel/internal/JBreak.java
@@ -8242,7 +8242,7 @@
+ f.p("break").p(label.label).p(';').nl();
More information about the distro-pkg-dev
mailing list