stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8169069: Module system implementation refresh (11/2016)

Browse Source 
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Reviewed-by: alanb, mchung
This commit is contained in:
Alan Bateman 2016-12-01 08:57:38 +00:00
parent 174b258e57
commit a5e4fa3d36
5 changed files with 7 additions and 5 deletions
jaxp
src
java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax
TemplatesImpl.java
jdk.xml.dom/share/classes
module-info.java
test
TEST.ROOT
javax/xml/jaxp
functional/catalog
DeferFeatureTest.java
module/ServiceProviderTest/src/unnamed
Main.java

3
jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java

@ -471,8 +471,7 @@ public final class TemplatesImpl implements Templates, Serializable {
String pn = _tfactory.getPackageName();
assert pn != null && pn.length() > 0;
ModuleDescriptor descriptor
= new ModuleDescriptor.Builder(mn)
ModuleDescriptor descriptor = ModuleDescriptor.module(mn)
.requires("java.xml")
.exports(pn)
.build();

2
jaxp/src/jdk.xml.dom/share/classes/module-info.java

@ -24,7 +24,7 @@
*/
module jdk.xml.dom {
requires public java.xml;
requires transitive java.xml;
exports org.w3c.dom.css;
exports org.w3c.dom.html;
exports org.w3c.dom.stylesheets;

2
jaxp/test/TEST.ROOT

@ -23,7 +23,7 @@ modules=java.xml
groups=TEST.groups
# Minimum jtreg version
requiredVersion=4.2 b03
requiredVersion=4.2 b04
# Use new module options
useNewOptions=true

1
jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java

@ -45,6 +45,7 @@ import org.testng.annotations.Test;
* @test
* @bug 8077931
* @library /javax/xml/jaxp/libs
* @modules java.xml/javax.xml.catalog:open
* @run testng/othervm -DrunSecMngr=true catalog.DeferFeatureTest
* @run testng/othervm catalog.DeferFeatureTest
* @summary This case tests whether the catalogs specified in delegateSystem,

4
jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/unnamed/Main.java

@ -23,6 +23,7 @@
import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
import java.lang.module.ModuleDescriptor.Provides;
import java.lang.reflect.Layer;
import java.lang.reflect.Module;
import java.util.Arrays;
@ -48,7 +49,8 @@ public class Main {
.map(xmlProviderName -> Layer.boot().findModule(xmlProviderName).get())
.mapToLong(
// services provided by the implementation in provider module
provider -> provider.getDescriptor().provides().keySet().stream()
provider -> provider.getDescriptor().provides().stream()
.map(Provides::service)
.filter(serviceName -> {
allServices.remove(serviceName); // remove service provided by
// customized module from allServices