8169069: Module system implementation refresh (11/2016)
Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Reviewed-by: alanb, mchung
This commit is contained in:
parent
ebe680ca0f
commit
93568043de
jaxws/src
java.activation/share/classes
java.xml.bind/share/classes
java.xml.ws/share/classes
jdk.xml.bind/share/classes
jdk.xml.ws/share/classes
@ -27,7 +27,7 @@
|
||||
* Defines the JavaBeans Activation Framework (JAF) API.
|
||||
*/
|
||||
module java.activation {
|
||||
requires public java.datatransfer;
|
||||
requires transitive java.datatransfer;
|
||||
requires java.logging;
|
||||
|
||||
exports javax.activation;
|
||||
|
@ -39,7 +39,7 @@ class AccessorInjector {
|
||||
|
||||
private static final Logger logger = Util.getClassLogger();
|
||||
|
||||
protected static final boolean noOptimize =
|
||||
protected static final boolean noOptimize = Runtime.version().major() >= 9 ||
|
||||
Util.getSystemProperty(ClassTailor.class.getName()+".noOptimize")!=null;
|
||||
|
||||
static {
|
||||
|
@ -27,8 +27,8 @@
|
||||
* Defines the Java Architecture for XML Binding (JAXB) API.
|
||||
*/
|
||||
module java.xml.bind {
|
||||
requires public java.activation;
|
||||
requires public java.xml;
|
||||
requires transitive java.activation;
|
||||
requires transitive java.xml;
|
||||
requires java.compiler;
|
||||
requires java.desktop;
|
||||
requires java.logging;
|
||||
@ -91,6 +91,10 @@ module java.xml.bind {
|
||||
java.xml.ws,
|
||||
jdk.xml.bind,
|
||||
jdk.xml.ws;
|
||||
opens 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
|
||||
|
@ -346,6 +346,7 @@ public class RuntimeModeler {
|
||||
}
|
||||
|
||||
private boolean noWrapperGen() {
|
||||
if (Runtime.version().major() >= 9) return true;
|
||||
Object o = config.properties().get(SuppressDocLitWrapperGeneration);
|
||||
return (o!= null && o instanceof Boolean) ? ((Boolean) o) : false;
|
||||
}
|
||||
|
@ -28,9 +28,9 @@
|
||||
* the Web Services Metadata API.
|
||||
*/
|
||||
module java.xml.ws {
|
||||
requires public java.activation;
|
||||
requires public java.xml;
|
||||
requires public java.xml.bind;
|
||||
requires transitive java.activation;
|
||||
requires transitive java.xml;
|
||||
requires transitive java.xml.bind;
|
||||
requires java.annotations.common;
|
||||
requires java.desktop;
|
||||
requires java.logging;
|
||||
@ -55,6 +55,8 @@ module java.xml.ws {
|
||||
exports javax.xml.ws.spi.http;
|
||||
exports javax.xml.ws.wsaddressing;
|
||||
|
||||
opens javax.xml.ws.wsaddressing to java.xml.bind;
|
||||
|
||||
exports com.oracle.webservices.internal.api.databinding to
|
||||
jdk.xml.ws;
|
||||
exports com.sun.xml.internal.ws.addressing to
|
||||
@ -102,10 +104,13 @@ module java.xml.ws {
|
||||
jdk.xml.ws;
|
||||
|
||||
// XML document content needs to be exported
|
||||
exports com.sun.xml.internal.ws.runtime.config to java.xml.bind;
|
||||
opens 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;
|
||||
opens com.sun.xml.internal.ws.fault to java.xml.bind;
|
||||
|
||||
// classes passed to JAXBContext.newInstance for deep reflection
|
||||
opens com.sun.xml.internal.ws.addressing to java.xml.bind;
|
||||
|
||||
// JAF data handlers
|
||||
exports com.sun.xml.internal.messaging.saaj.soap to
|
||||
|
@ -56,18 +56,19 @@ module jdk.xml.bind {
|
||||
jdk.xml.ws;
|
||||
|
||||
// XML document content needs to be exported
|
||||
exports com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
|
||||
opens 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;
|
||||
provides com.sun.tools.internal.xjc.Plugin with
|
||||
com.sun.tools.internal.xjc.addon.accessors.PluginImpl,
|
||||
com.sun.tools.internal.xjc.addon.at_generated.PluginImpl,
|
||||
com.sun.tools.internal.xjc.addon.code_injector.PluginImpl,
|
||||
com.sun.tools.internal.xjc.addon.episode.PluginImpl,
|
||||
com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn,
|
||||
com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn;
|
||||
}
|
||||
|
||||
|
@ -33,6 +33,7 @@ module jdk.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;
|
||||
provides com.sun.tools.internal.ws.wscompile.Plugin with
|
||||
com.sun.tools.internal.ws.wscompile.plugin.at_generated.PluginImpl;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user