Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2016-04-12 19:36:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_9_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes
2016-03-29 10:39:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2016-04-12 19:36:58.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 8 10:54:12 UTC 2016 - [email protected]
+
+- Upgrade to upstream tag jdk-9+113
+
+-------------------------------------------------------------------
Old:
----
0db939c930f3.tar.bz2
1c1bb661d35b.tar.bz2
2f5d1578b240.tar.bz2
925be13b3740.tar.bz2
9417e1bcded6.tar.bz2
9666775734fb.tar.bz2
9937077e48f1.tar.bz2
9b4c916633f8.tar.bz2
New:
----
28626780e245.tar.bz2
4e87682893e6.tar.bz2
55b6d550828d.tar.bz2
68f8be44b6a6.tar.bz2
a5d1990fd32d.tar.bz2
c569f8d89269.tar.bz2
cc30faa2da49.tar.bz2
e980062475c1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.scF8PJ/_old 2016-04-12 19:37:00.000000000 +0200
+++ /var/tmp/diff_new_pack.scF8PJ/_new 2016-04-12 19:37:00.000000000 +0200
@@ -33,17 +33,17 @@
%global minorver 0
%global securityver 0
%global patchver 0
-%global buildver 110
+%global buildver 113
%global root_project jdk9
%global root_repository jdk9
-%global root_revision 925be13b3740
-%global corba_revision 9666775734fb
-%global hotspot_revision 2f5d1578b240
-%global jaxp_revision 1c1bb661d35b
-%global jaxws_revision 0db939c930f3
-%global jdk_revision 9417e1bcded6
-%global langtools_revision 9b4c916633f8
-%global nashorn_revision 9937077e48f1
+%global root_revision 55b6d550828d
+%global corba_revision cc30faa2da49
+%global hotspot_revision c569f8d89269
+%global jaxp_revision 28626780e245
+%global jaxws_revision e980062475c1
+%global jdk_revision 68f8be44b6a6
+%global langtools_revision 4e87682893e6
+%global nashorn_revision a5d1990fd32d
%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
%global priority 1905
@@ -163,7 +163,7 @@
Release: 0
Summary: OpenJDK Runtime Environment
License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and
GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and
SUSE-Public-Domain and W3C
-Group: Development/Languages
+Group: Development/Languages/Java
Url: http://openjdk.java.net/
# Sources from upstream OpenJDK9 project.
Source0:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/archive/%{root_revision}.tar.bz2
@@ -293,7 +293,7 @@
%if %{bootcycle}
BuildRequires: java-1.8.0-devel >= 1.8.0
%else
-BuildRequires: java-devel >= %{majorver}.0.0.0
+BuildRequires: java-%{javaver}-devel
%endif
# runtime certificates generation available in 11.3+ - bnc#596177
%if 0%{?suse_version} >= 1130
@@ -320,7 +320,7 @@
%package headless
Summary: OpenJDK Runtime Environment
-Group: Development/Languages
+Group: Development/Languages/Java
# Require jpackage-utils (with java9 compatibility) for ownership of
/usr/lib/jvm/
Requires: jpackage-utils-java9
# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
@@ -354,7 +354,7 @@
%package devel
Summary: OpenJDK Development Environment
-Group: Development/Tools
+Group: Development/Languages/Java
# Require base package.
Requires: %{name} = %{version}-%{release}
# Post requires update-alternatives to install tool update-alternatives.
@@ -375,7 +375,7 @@
%package demo
Summary: OpenJDK Demos
-Group: Development/Languages
+Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
%description demo
@@ -383,7 +383,7 @@
%package src
Summary: OpenJDK Source Bundle
-Group: Development/Languages
+Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
%description src
@@ -391,7 +391,7 @@
%package javadoc
Summary: OpenJDK API Documentation
-Group: Documentation
+Group: Development/Languages/Java
Requires: jpackage-utils-java9
# Post requires update-alternatives to install javadoc alternative.
Requires(post): update-alternatives
@@ -409,7 +409,7 @@
%package accessibility
Summary: OpenJDK accessibility connector
-Group: Development/Languages
+Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
Requires: java-atk-wrapper
@@ -558,6 +558,7 @@
--with-jvm-variants=zero \
%endif
--disable-zip-debug-info \
+ --disable-keep-packaged-modules \
--with-milestone="fcs" \
--with-update-version=%{updatever} \
--with-build-number=%{buildver} \
@@ -1042,7 +1043,6 @@
%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/jli
%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/server
%dir %{_jvmdir}/%{jredir}/lib/desktop
-%dir %{_jvmdir}/%{jredir}/lib/modules
%dir %{_jvmdir}/%{jredir}/lib/security
%doc %{buildoutputdir}/%{imagesdir}/jdk/jre/ASSEMBLY_EXCEPTION
++++++ 925be13b3740.tar.bz2 -> 28626780e245.tar.bz2 ++++++
++++ 874503 lines of diff (skipped)
++++++ 9417e1bcded6.tar.bz2 -> 4e87682893e6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/9417e1bcded6.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/4e87682893e6.tar.bz2 differ:
char 11, line 1
++++++ 9417e1bcded6.tar.bz2 -> 55b6d550828d.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/9417e1bcded6.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/55b6d550828d.tar.bz2 differ:
char 11, line 1
++++++ 0db939c930f3.tar.bz2 -> 68f8be44b6a6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0db939c930f3.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/68f8be44b6a6.tar.bz2 differ:
char 11, line 1
++++++ 0db939c930f3.tar.bz2 -> a5d1990fd32d.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0db939c930f3.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/a5d1990fd32d.tar.bz2 differ:
char 11, line 1
++++++ 0db939c930f3.tar.bz2 -> c569f8d89269.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0db939c930f3.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/c569f8d89269.tar.bz2 differ:
char 11, line 1
++++++ 0db939c930f3.tar.bz2 -> cc30faa2da49.tar.bz2 ++++++
++++ 792883 lines of diff (skipped)
++++++ 0db939c930f3.tar.bz2 -> e980062475c1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-0db939c930f3/.hg_archival.txt
new/jaxws-e980062475c1/.hg_archival.txt
--- old/jaxws-0db939c930f3/.hg_archival.txt 2016-03-10 18:28:14.000000000
+0100
+++ new/jaxws-e980062475c1/.hg_archival.txt 2016-03-31 10:13:24.000000000
+0200
@@ -1,4 +1,4 @@
repo: 0961a4a211765fea071b8dac419003ee0c3d5973
-node: 0db939c930f332dfa275cedfc7cf223ff1221ea4
+node: e980062475c10d21137051045bf95ee229db9b27
branch: default
-tag: jdk-9+110
+tag: jdk-9+113
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-0db939c930f3/.hgtags
new/jaxws-e980062475c1/.hgtags
--- old/jaxws-0db939c930f3/.hgtags 2016-03-10 18:28:14.000000000 +0100
+++ new/jaxws-e980062475c1/.hgtags 2016-03-31 10:13:24.000000000 +0200
@@ -355,3 +355,6 @@
fafd694e801f0f5a7c737fb08630ced3ca8f772c jdk-9+107
513eb2e432f64f85992442da9acdfcfbb36555d9 jdk-9+108
4b0697e4ce8940b1599af274ff02296d7f59aded jdk-9+109
+0db939c930f332dfa275cedfc7cf223ff1221ea4 jdk-9+110
+4d5296e0920afe7ef8d4db1939b76f0d407a3812 jdk-9+111
+21274e7937bae291658d68143aca0e3ee9296db0 jdk-9+112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.activation/share/classes/javax/activation/DataContentHandler.java
new/jaxws-e980062475c1/src/java.activation/share/classes/javax/activation/DataContentHandler.java
---
old/jaxws-0db939c930f3/src/java.activation/share/classes/javax/activation/DataContentHandler.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.activation/share/classes/javax/activation/DataContentHandler.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,18 +33,23 @@
import javax.activation.DataSource;
/**
- * The DataContentHandler interface is implemented by objects that can
+ * <p>The DataContentHandler interface is implemented by objects that can
* be used to extend the capabilities of the DataHandler's implementation
* of the Transferable interface. Through <code>DataContentHandlers</code>
* the framework can be extended to convert streams in to objects, and
- * to write objects to streams. <p>
+ * to write objects to streams.</p>
*
- * Applications don't generally call the methods in DataContentHandlers
+ * <p>An implementation of DataContentHandler should be a public class
+ * with a public no-arg constructor. If the implementation class is in
+ * a named module then it should be in an API package that is exported
+ * to the module {@code java.activation}.</p>
+ *
+ * <p>Applications don't generally call the methods in DataContentHandlers
* directly. Instead, an application calls the equivalent methods in
* DataHandler. The DataHandler will attempt to find an appropriate
* DataContentHandler that corresponds to its MIME type using the
* current DataContentHandlerFactory. The DataHandler then calls
- * through to the methods in the DataContentHandler.
+ * through to the methods in the DataContentHandler.</p>
*
* @since 1.6
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
new/jaxws-e980062475c1/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
---
old/jaxws-0db939c930f3/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -580,8 +580,7 @@
// if anything goes wrong, do it the old way
cl = Class.forName(name);
}
- if (cl != null) // XXX - always true?
- return (DataContentHandler)cl.newInstance();
+ return (DataContentHandler) cl.newInstance();
} catch (IllegalAccessException e) {
if (LogSupport.isLoggable())
LogSupport.log("Can't load DCH " + name, e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.activation/share/classes/module-info.java
new/jaxws-e980062475c1/src/java.activation/share/classes/module-info.java
--- old/jaxws-0db939c930f3/src/java.activation/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++ new/jaxws-e980062475c1/src/java.activation/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module java.activation {
+ requires public java.datatransfer;
+ // dependence on java.beans.Beans to be eliminated
+ requires java.desktop;
+ requires java.logging;
+
+ exports javax.activation;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.annotations.common/share/classes/module-info.java
new/jaxws-e980062475c1/src/java.annotations.common/share/classes/module-info.java
---
old/jaxws-0db939c930f3/src/java.annotations.common/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.annotations.common/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module java.annotations.common {
+ exports javax.annotation;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
new/jaxws-e980062475c1/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
---
old/jaxws-0db939c930f3/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
2016-03-31 10:13:24.000000000 +0200
@@ -113,7 +113,6 @@
m.put(clazz,new WeakReference<Constructor>(cons));
}
-
return cons.newInstance(emptyObject);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.bind/share/classes/module-info.java
new/jaxws-e980062475c1/src/java.xml.bind/share/classes/module-info.java
--- old/jaxws-0db939c930f3/src/java.xml.bind/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++ new/jaxws-e980062475c1/src/java.xml.bind/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module java.xml.bind {
+ requires public java.activation;
+ requires public java.xml;
+ requires java.compiler;
+ requires java.desktop;
+ requires java.logging;
+
+ uses javax.xml.bind.JAXBContextFactory;
+
+ exports javax.xml.bind;
+ exports javax.xml.bind.annotation;
+ exports javax.xml.bind.annotation.adapters;
+ exports javax.xml.bind.attachment;
+ exports javax.xml.bind.helpers;
+ exports javax.xml.bind.util;
+ exports com.sun.istack.internal to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.istack.internal.localization to
+ java.xml.ws,
+ jdk.xml.ws;
+ exports com.sun.istack.internal.logging to
+ java.xml.ws,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.annotation to
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.api to
+ java.xml.ws,
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.api.impl to
+ java.xml.ws,
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.marshaller to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.unmarshaller to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.util to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.v2 to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.v2.model.annotation to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.v2.model.core to
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.model.impl to
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.model.nav to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.bind.v2.model.runtime to
+ java.xml.ws;
+ exports com.sun.xml.internal.bind.v2.model.util to
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.runtime to
+ java.xml.ws,
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.runtime.unmarshaller to
+ java.xml.ws;
+ exports com.sun.xml.internal.bind.v2.schemagen to
+ java.xml.ws,
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.schemagen.episode to
+ jdk.xml.bind;
+ exports com.sun.xml.internal.bind.v2.schemagen.xmlschema to
+ java.xml.ws;
+ exports com.sun.xml.internal.bind.v2.util to
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.fastinfoset to
+ java.xml.ws;
+ exports com.sun.xml.internal.fastinfoset.stax to
+ java.xml.ws;
+ exports com.sun.xml.internal.fastinfoset.vocab to
+ java.xml.ws;
+ exports com.sun.xml.internal.org.jvnet.fastinfoset to
+ java.xml.ws;
+ exports com.sun.xml.internal.org.jvnet.mimepull to
+ java.xml.ws;
+ exports com.sun.xml.internal.org.jvnet.staxex to
+ java.xml.ws;
+ exports com.sun.xml.internal.org.jvnet.staxex.util to
+ java.xml.ws;
+ exports com.sun.xml.internal.txw2 to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.txw2.annotation to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+ exports com.sun.xml.internal.txw2.output to
+ java.xml.ws,
+ jdk.xml.bind,
+ jdk.xml.ws;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
---
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package com.sun.xml.internal.ws.api.server;
import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.ws.server.ServerRtException;
import com.sun.xml.internal.ws.streaming.TidyXMLStreamReader;
import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
@@ -34,6 +35,7 @@
import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
/**
@@ -111,6 +113,48 @@
};
}
+ /**
+ * Creates {@link SDDocumentSource} from resource path using
resolvingClass to read the resource.
+ * Required for Jigsaw runtime.
+ *
+ * @param resolvingClass class used to read resource
+ * @param path resource path
+ */
+ public static SDDocumentSource create(final Class resolvingClass, final
String path) {
+ return new SDDocumentSource() {
+
+ public XMLStreamReader read(XMLInputFactory xif) throws
IOException, XMLStreamException {
+ InputStream is = inputStream();
+ return new
TidyXMLStreamReader(xif.createXMLStreamReader(path,is), is);
+ }
+
+ public XMLStreamReader read() throws IOException,
XMLStreamException {
+ InputStream is = inputStream();
+ return new
TidyXMLStreamReader(XMLStreamReaderFactory.create(path,is,false), is);
+ }
+
+ public URL getSystemId() {
+ try {
+ return new URL("file://" + path);
+ } catch (MalformedURLException e) {
+ return null;
+ }
+ }
+
+ private InputStream inputStream() throws IOException {
+ java.lang.reflect.Module module = resolvingClass.getModule();
+ if (module != null) {
+ InputStream stream = module.getResourceAsStream(path);
+ if (stream != null) {
+ return stream;
+ }
+ }
+ throw new ServerRtException("cannot.load.wsdl", path);
+ }
+
+ };
+ }
+
/**
* Creates a {@link SDDocumentSource} from {@link XMLStreamBuffer}.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
---
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -372,7 +372,7 @@
if (url != null) {
return SDDocumentSource.create(url);
}
- throw new ServerRtException("cannot.load.wsdl", wsdlLocation);
+ return SDDocumentSource.create(implClass, wsdlLocation);
}
return null;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
---
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -197,28 +197,62 @@
return null;
}
- static InputStream getFileAsStream(Class clazz, HandlerChain chain) {
- URL url = clazz.getResource(chain.file());
- if (url == null) {
- url = Thread.currentThread().getContextClassLoader().
- getResource(chain.file());
- }
- if (url == null) {
- String tmp = clazz.getPackage().getName();
- tmp = tmp.replace('.', '/');
- tmp += "/" + chain.file();
- url =
-
Thread.currentThread().getContextClassLoader().getResource(tmp);
- }
+ static InputStream getFileAsStream(Class clazz, HandlerChain chain) {
+ Package pkg = clazz.getPackage();
+ String filename = chain.file();
+ String fullpath = addPackagePath(filename, pkg);
+ InputStream is;
+
+ is = moduleResource(clazz, filename);
+ if (is != null) return is;
+
+ is = moduleResource(clazz, fullpath);
+ if (is != null) return is;
+
+ URL url = cpResource(clazz, filename);
+ if (url == null) url = cpResource(clazz, fullpath);
+
if (url == null) {
throw new UtilException("util.failed.to.find.handlerchain.file",
- clazz.getName(), chain.file());
+ clazz.getName(), filename);
}
try {
return url.openStream();
} catch (IOException e) {
throw new UtilException("util.failed.to.parse.handlerchain.file",
- clazz.getName(), chain.file());
+ clazz.getName(), filename);
}
}
+
+ private static URL cpResource(Class clazz, String name) {
+ URL url = clazz.getResource(name);
+ if (url == null) {
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ url = tccl.getResource(name);
+ }
+ return url;
+ }
+
+ private static InputStream moduleResource(Class resolvingClass, String
name) {
+ java.lang.reflect.Module module = resolvingClass.getModule();
+ if (module != null) {
+ try {
+ InputStream stream = module.getResourceAsStream(name);
+ if (stream != null) {
+ return stream;
+ }
+ } catch(IOException e) {
+ throw new
UtilException("util.failed.to.find.handlerchain.file",
+ resolvingClass.getName(), name);
+ }
+ }
+ return null;
+ }
+
+ private static String addPackagePath(String file, Package pkg) {
+ String tmp = pkg.getName();
+ tmp = tmp.replace('.', '/');
+ tmp += "/" + file;
+ return tmp;
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/module-info.java
new/jaxws-e980062475c1/src/java.xml.ws/share/classes/module-info.java
--- old/jaxws-0db939c930f3/src/java.xml.ws/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++ new/jaxws-e980062475c1/src/java.xml.ws/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module java.xml.ws {
+ requires public java.activation;
+ requires public java.xml;
+ requires public java.xml.bind;
+ requires java.annotations.common;
+ requires java.desktop;
+ requires java.logging;
+ requires java.management;
+ requires java.rmi;
+ requires jdk.httpserver;
+
+ uses javax.xml.ws.spi.Provider;
+ uses javax.xml.soap.MessageFactory;
+ uses javax.xml.soap.SAAJMetaFactory;
+ uses javax.xml.soap.SOAPConnectionFactory;
+ uses javax.xml.soap.SOAPFactory;
+
+ exports javax.jws;
+ exports javax.jws.soap;
+ exports javax.xml.soap;
+ exports javax.xml.ws;
+ exports javax.xml.ws.handler;
+ exports javax.xml.ws.handler.soap;
+ exports javax.xml.ws.http;
+ exports javax.xml.ws.soap;
+ exports javax.xml.ws.spi;
+ exports javax.xml.ws.spi.http;
+ exports javax.xml.ws.wsaddressing;
+
+ exports com.oracle.webservices.internal.api.databinding to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.addressing to
+ jdk.xml.ws,
+ java.xml.bind;
+ exports com.sun.xml.internal.ws.addressing.v200408 to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.addressing to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.databinding to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.model to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.server to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.streaming to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.wsdl.parser to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.api.wsdl.writer to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.binding to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.db to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.model to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.policy.sourcemodel.wspolicy to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.spi.db to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.streaming to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.util to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.util.exception to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.util.xml to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.wsdl.parser to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.ws.wsdl.writer to
+ jdk.xml.ws;
+
+ // XML document content needs to be exported
+ exports com.sun.xml.internal.ws.runtime.config to java.xml.bind;
+
+ // com.sun.xml.internal.ws.fault.SOAPFaultBuilder uses
JAXBContext.newInstance
+ exports com.sun.xml.internal.ws.fault to java.xml.bind;
+
+ // JAF data handlers
+ exports com.sun.xml.internal.messaging.saaj.soap to
+ java.activation;
+ exports com.sun.xml.internal.ws.encoding to
+ java.activation;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
---
old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.net.URL;
import java.text.ParseException;
import java.util.Iterator;
import java.util.List;
@@ -69,22 +68,17 @@
private final JPackage pkg;
private final String className;
- private final URL source;
+ private final ResourceLoader source;
private final JStaticClass clazz;
private final LineFilter filter;
- public JStaticJavaFile(JPackage _pkg, String className, String
_resourceName) {
- this( _pkg, className,
-
SecureLoader.getClassClassLoader(JStaticJavaFile.class).getResource(_resourceName),
null );
- }
-
- public JStaticJavaFile(JPackage _pkg, String _className, URL _source,
LineFilter _filter ) {
- super(_className+".java");
- if(_source==null) throw new NullPointerException();
+ public JStaticJavaFile(JPackage _pkg, String _className, Class<?>
loadingClass, LineFilter _filter) {
+ super(_className + ".java");
+ if (loadingClass == null) throw new NullPointerException();
this.pkg = _pkg;
this.clazz = new JStaticClass();
this.className = _className;
- this.source = _source;
+ this.source = new ResourceLoader(_className, loadingClass);
this.filter = _filter;
}
@@ -100,14 +94,13 @@
}
protected void build(OutputStream os) throws IOException {
- InputStream is = source.openStream();
-
- BufferedReader r = new BufferedReader(new InputStreamReader(is));
- PrintWriter w = new PrintWriter(new BufferedWriter(new
OutputStreamWriter(os)));
- LineFilter filter = createLineFilter();
int lineNumber=1;
-
- try {
+ try (
+ InputStream is = source.getResourceAsStream();
+ BufferedReader r = new BufferedReader(new
InputStreamReader(is));
+ PrintWriter w = new PrintWriter(new BufferedWriter(new
OutputStreamWriter(os)));
+ ) {
+ LineFilter filter = createLineFilter();
String line;
while((line=r.readLine())!=null) {
line = filter.process(line);
@@ -118,9 +111,6 @@
} catch( ParseException e ) {
throw new IOException("unable to process "+source+"
line:"+lineNumber+"\n"+e.getMessage());
}
-
- w.close();
- r.close();
}
/**
@@ -235,5 +225,32 @@
protected JClass substituteParams(JTypeVar[] variables, List<JClass>
bindings) {
return this;
}
- };
+ }
+
+ static class ResourceLoader {
+ Class<?> loadingClass;
+ String shortName;
+
+ ResourceLoader(String shortName, Class<?> loadingClass) {
+ this.loadingClass = loadingClass;
+ this.shortName = shortName;
+ }
+
+ InputStream getResourceAsStream() {
+ // some people didn't like our jars to contain files with .java
extension,
+ // so when we build jars, we'' use ".java_". But when we run from
the workspace,
+ // we want the original source code to be used, so we check both
here.
+ // see bug 6211503.
+ InputStream stream = loadingClass.getResourceAsStream(shortName +
".java");
+ if (stream == null) {
+ stream = loadingClass.getResourceAsStream(shortName +
".java_");
+ }
+ if (stream == null) {
+ throw new InternalError("Unable to load source code of " +
loadingClass.getName() + " as a resource");
+ }
+ return stream;
+ }
+
+ }
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
---
old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
2016-03-10 18:28:14.000000000 +0100
+++
new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
2016-03-31 10:13:24.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED;
import java.io.Serializable;
-import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -809,26 +808,14 @@
}
public JClass generateStaticClass(Class src, JPackage out) {
- String shortName = getShortName(src.getName());
-
- // some people didn't like our jars to contain files with .java
extension,
- // so when we build jars, we'' use ".java_". But when we run from the
workspace,
- // we want the original source code to be used, so we check both here.
- // see bug 6211503.
- URL res = src.getResource(shortName + ".java");
- if (res == null) {
- res = src.getResource(shortName + ".java_");
- }
- if (res == null) {
- throw new InternalError("Unable to load source code of " +
src.getName() + " as a resource");
- }
-
- JStaticJavaFile sjf = new JStaticJavaFile(out, shortName, res, null);
+ JStaticJavaFile sjf = new JStaticJavaFile(out, getShortName(src), src,
null);
out.addResourceFile(sjf);
return sjf.getJClass();
}
- private String getShortName(String name) {
+ private String getShortName(Class src) {
+ String name = src.getName();
return name.substring(name.lastIndexOf('.') + 1);
}
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/module-info.java
new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/module-info.java
--- old/jaxws-0db939c930f3/src/jdk.xml.bind/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++ new/jaxws-e980062475c1/src/jdk.xml.bind/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module jdk.xml.bind {
+ requires java.activation;
+ requires java.compiler;
+ requires java.desktop;
+ requires java.logging;
+ requires java.xml;
+ requires java.xml.bind;
+ requires jdk.compiler;
+
+ exports com.sun.codemodel.internal to
+ jdk.xml.ws;
+ exports com.sun.codemodel.internal.writer to
+ jdk.xml.ws;
+ exports com.sun.istack.internal.tools to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.jxc.ap to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.jxc.model.nav to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.xjc to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.xjc.api to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.xjc.reader to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.xjc.reader.internalizer to
+ jdk.xml.ws;
+ exports com.sun.tools.internal.xjc.util to
+ jdk.xml.ws;
+ exports com.sun.xml.internal.xsom.parser to
+ jdk.xml.ws;
+
+ // XML document content needs to be exported
+ exports com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
+ java.xml.bind;
+
+ // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses
JAXBContext
+ exports com.sun.tools.internal.xjc.generator.bean to java.xml.bind;
+
+ uses com.sun.tools.internal.xjc.Plugin;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.accessors.PluginImpl;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.at_generated.PluginImpl;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.code_injector.PluginImpl;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.episode.PluginImpl;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn;
+ provides com.sun.tools.internal.xjc.Plugin with
com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-0db939c930f3/src/jdk.xml.ws/share/classes/module-info.java
new/jaxws-e980062475c1/src/jdk.xml.ws/share/classes/module-info.java
--- old/jaxws-0db939c930f3/src/jdk.xml.ws/share/classes/module-info.java
1970-01-01 01:00:00.000000000 +0100
+++ new/jaxws-e980062475c1/src/jdk.xml.ws/share/classes/module-info.java
2016-03-31 10:13:24.000000000 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module jdk.xml.ws {
+ requires java.compiler;
+ requires java.logging;
+ requires java.rmi;
+ requires java.xml;
+ requires java.xml.bind;
+ requires java.xml.ws;
+ requires jdk.xml.bind;
+
+ uses com.sun.tools.internal.ws.wscompile.Plugin;
+ provides com.sun.tools.internal.ws.wscompile.Plugin with
com.sun.tools.internal.ws.wscompile.plugin.at_generated.PluginImpl;
+}
+
