8157135: Fix module dependencies javax/* EE tests
authorxiaofeya
Mon, 01 Aug 2016 18:14:06 -0700
changeset 39892 4418a310ddbb
parent 39891 429395d775e7
child 39893 56745139718c
8157135: Fix module dependencies javax/* EE tests Reviewed-by: alanb Contributed-by: Felix Yang <felix.yang@oracle.com>
jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java
jdk/test/javax/transaction/testng/Driver.java
jdk/test/javax/xml/soap/spi/SAAJFactoryTest.java
jdk/test/javax/xml/ws/8043129/MailTest.java
jdk/test/javax/xml/ws/publish/WSTest.java
jdk/test/javax/xml/ws/xsanymixed/Test.java
--- a/jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java	Mon Aug 01 18:14:06 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
  * @bug 8068721
  * @summary test RMI-IIOP call with ConcurrentHashMap as an argument
  * @library /lib/testlibrary
+ * @modules java.corba
  * @build jdk.testlibrary.*
  * @compile -addmods java.corba Test.java HelloInterface.java HelloServer.java HelloClient.java
  *    HelloImpl.java _HelloImpl_Tie.java _HelloInterface_Stub.java ConcurrentHashMapTest.java
--- a/jdk/test/javax/transaction/testng/Driver.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/transaction/testng/Driver.java	Mon Aug 01 18:14:06 2016 -0700
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @modules java.sql java.transaction
  * @compile -addmods java.transaction
  *   test/transaction/InvalidTransactionExceptionTests.java
  *   test/transaction/TransactionRequiredExceptionTests.java
--- a/jdk/test/javax/xml/soap/spi/SAAJFactoryTest.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/xml/soap/spi/SAAJFactoryTest.java	Mon Aug 01 18:14:06 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -49,6 +49,7 @@
  * run main/othervm SAAJFactoryTest saaj.factory.Valid -
  *      scenario14 javax.xml.soap.MessageFactory=saaj.factory.Valid saaj.factory.Valid2 -
  *
+ * @modules java.xml.ws
  * @compile -addmods java.xml.ws saaj/factory/Invalid.java saaj/factory/Valid.java
  *     saaj/factory/Valid2.java saaj/factory/Valid3.java SAAJFactoryTest.java
  *
--- a/jdk/test/javax/xml/ws/8043129/MailTest.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/xml/ws/8043129/MailTest.java	Mon Aug 01 18:14:06 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -27,6 +27,7 @@
  * @summary JAF initialisation in SAAJ clashing with the one in javax.mail
  * @author mkos
  * @library javax.mail.jar
+ * @modules java.xml.ws
  * @compile -addmods java.xml.ws MailTest.java
  * @run main/othervm -addmods java.xml.ws MailTest
  */
--- a/jdk/test/javax/xml/ws/publish/WSTest.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/xml/ws/publish/WSTest.java	Mon Aug 01 18:14:06 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8146086
  * @summary Publishing two webservices on same port fails with "java.net.BindException: Address already in use"
+ * @modules java.xml.ws
  * @compile -addmods java.xml.ws WSTest.java
  * @run main/othervm -addmods java.xml.ws WSTest
  */
--- a/jdk/test/javax/xml/ws/xsanymixed/Test.java	Mon Aug 01 17:00:26 2016 -0400
+++ b/jdk/test/javax/xml/ws/xsanymixed/Test.java	Mon Aug 01 18:14:06 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
  * @bug 8036981 8038966 8051441
  * @summary the content of xs:any content:mixed should remain as is,
  *          no white space changes and no changes to namespace prefixes
+ * @modules java.xml.ws
  * @run shell compile-wsdl.sh
  * @compile -addmods java.xml.ws Test.java
  * @run main/othervm -addmods java.xml.ws Test