* The {@link Marshaller} class provides the client application the ability
* to convert a Java content tree back into XML data. There is no difference
* between marshalling a content tree that is created manually using the factory
- * methods and marshalling a content tree that is the result an unmarshal
- * operation. Clients can marshal a java content tree back to XML data
- * to a java.io.OutputStream or a java.io.Writer . The
+ * methods and marshalling a content tree that is the result an {@code unmarshal}
+ * operation. Clients can marshal a java content tree back to XML data
+ * to a {@code java.io.OutputStream} or a {@code java.io.Writer}. The
* marshalling process can alternatively produce SAX2 event streams to a
- * registered ContentHandler or produce a DOM Node object.
+ * registered {@code ContentHandler} or produce a DOM Node object.
* Client applications have control over the output encoding as well as
* whether or not to marshal the XML data as a complete document or
* as a fragment.
@@ -178,7 +177,7 @@ import java.io.InputStream;
* Validation has been changed significantly since JAXB 1.0. The {@link Validator}
* class has been deprecated and made optional. This means that you are advised
* not to use this class and, in fact, it may not even be available depending on
- * your JAXB provider. JAXB 1.0 client applications that rely on Validator
+ * your JAXB provider. JAXB 1.0 client applications that rely on {@code Validator}
* will still work properly when deployed with the JAXB 1.0 runtime system.
*
* In JAXB 2.0, the {@link Unmarshaller} has included convenince methods that expose
@@ -192,8 +191,8 @@ import java.io.InputStream;
* The following JAXB 1.0 restriction only applies to binding schema to
* interfaces/implementation classes.
* Since this binding does not require a common runtime system, a JAXB
- * client application must not attempt to mix runtime objects (JAXBContext,
- * Marshaller , etc. ) from different providers. This does not
+ * client application must not attempt to mix runtime objects ({@code JAXBContext,
+ * Marshaller}, etc. ) from different providers. This does not
* mean that the client application isn't portable, it simply means that a
* client has to use a runtime system provided by the same provider that was
* used to compile the schema.
@@ -201,14 +200,14 @@ import java.io.InputStream;
*
*
*
*
* For each package/class explicitly passed in to the {@link #newInstance} method, in the order they are specified,
- * jaxb.properties file is looked up in its package, by using the associated classloader —
+ * {@code jaxb.properties} file is looked up in its package, by using the associated classloader —
* this is {@link Class#getClassLoader() the owner class loader} for a {@link Class} argument, and for a package
* the specified {@link ClassLoader}.
*
@@ -269,8 +268,6 @@ import java.io.InputStream;
* {@link javax.xml.bind.JAXBContextFactory#createContext(Class[], java.util.Map)} is invoked
* to create a {@link JAXBContext}.
*
- *
- *
* @apiNote
* Service discovery method using file /META-INF/services/javax.xml.bind.JAXBContext (described in step 4)
* and leveraging provider's static methods is supported only to allow backwards compatibility, but it is strongly
@@ -294,7 +291,7 @@ public abstract class JAXBContext {
/**
* The name of the property that contains the name of the class capable
- * of creating new JAXBContext objects.
+ * of creating new {@code JAXBContext} objects.
*/
public static final String JAXB_CONTEXT_FACTORY = "javax.xml.bind.JAXBContextFactory";
@@ -303,8 +300,7 @@ public abstract class JAXBContext {
/**
- *
- * Create a new instance of a JAXBContext class.
+ * Create a new instance of a {@code JAXBContext} class.
*
*
* This is a convenience method to invoke the
@@ -312,7 +308,7 @@ public abstract class JAXBContext {
* the context class loader of the current thread.
*
* @throws JAXBException if an error was encountered while creating the
- * JAXBContext such as
+ * {@code JAXBContext} such as
*
* failure to locate either ObjectFactory.class or jaxb.index in the packages
* an ambiguity among global elements contained in the contextPath
@@ -328,8 +324,7 @@ public abstract class JAXBContext {
}
/**
- *
- * Create a new instance of a JAXBContext class.
+ * Create a new instance of a {@code JAXBContext} class.
*
*
* The client application must supply a context path which is a list of
@@ -340,7 +335,7 @@ public abstract class JAXBContext {
* ObjectFactory.class generated per package.
* Alternatively than being listed in the context path, programmer
* annotated JAXB mapped classes can be listed in a
- * jaxb.index resource file, format described below.
+ * {@code jaxb.index} resource file, format described below.
* Note that a java package can contain both schema-derived classes and
* user annotated JAXB classes. Additionally, the java package may
* contain JAXB package annotations that must be processed. (see JLS,
@@ -349,7 +344,7 @@ public abstract class JAXBContext {
*
*
* Every package listed on the contextPath must meet one or both of the
- * following conditions otherwise a JAXBException will be thrown:
+ * following conditions otherwise a {@code JAXBException} will be thrown:
*
*
* it must contain ObjectFactory.class
@@ -367,12 +362,12 @@ public abstract class JAXBContext {
* are reachable, as defined in {@link #newInstance(Class...)}, from the
* listed classes are also registered with JAXBContext.
*
- * Constraints on class name occuring in a jaxb.index file are:
+ * Constraints on class name occuring in a {@code jaxb.index} file are:
*
* Must not end with ".class".
* Class names are resolved relative to package containing
- * jaxb.index file. Only classes occuring directly in package
- * containing jaxb.index file are allowed.
+ * {@code jaxb.index} file. Only classes occuring directly in package
+ * containing {@code jaxb.index} file are allowed.
* Fully qualified class names are not allowed.
* A qualified class name,relative to current package,
* is only allowed to specify a nested or inner class.
@@ -381,21 +376,21 @@ public abstract class JAXBContext {
*
* To maintain compatibility with JAXB 1.0 schema to java
* interface/implementation binding, enabled by schema customization
- * {@literal } ,
+ * {@code },
* the JAXB provider will ensure that each package on the context path
- * has a jaxb.properties file which contains a value for the
- * javax.xml.bind.context.factory property and that all values
+ * has a {@code jaxb.properties} file which contains a value for the
+ * {@code javax.xml.bind.context.factory} property and that all values
* resolve to the same provider. This requirement does not apply to
* JAXB annotated classes.
*
*
* If there are any global XML element name collisions across the various
- * packages listed on the contextPath , a JAXBException
+ * packages listed on the {@code contextPath}, a {@code JAXBException}
* will be thrown.
*
*
* Mixing generated interface/impl bindings from multiple JAXB Providers
- * in the same context path may result in a JAXBException
+ * in the same context path may result in a {@code JAXBException}
* being thrown.
*
*
@@ -408,9 +403,9 @@ public abstract class JAXBContext {
* This class loader will be used to locate the implementation
* classes.
*
- * @return a new instance of a JAXBContext
+ * @return a new instance of a {@code JAXBContext}
* @throws JAXBException if an error was encountered while creating the
- * JAXBContext such as
+ * {@code JAXBContext} such as
*
* failure to locate either ObjectFactory.class or jaxb.index in the packages
* an ambiguity among global elements contained in the contextPath
@@ -424,8 +419,7 @@ public abstract class JAXBContext {
}
/**
- *
- * Create a new instance of a JAXBContext class.
+ * Create a new instance of a {@code JAXBContext} class.
*
*
* This is mostly the same as {@link JAXBContext#newInstance(String, ClassLoader)},
@@ -434,7 +428,7 @@ public abstract class JAXBContext {
*
*
* The interpretation of properties is up to implementations. Implementations should
- * throw JAXBException if it finds properties that it doesn't understand.
+ * throw {@code JAXBException} if it finds properties that it doesn't understand.
*
* @param contextPath list of java package names that contain schema derived classes
* @param classLoader
@@ -443,9 +437,9 @@ public abstract class JAXBContext {
* provider-specific properties. Can be null, which means the same thing as passing
* in an empty map.
*
- * @return a new instance of a JAXBContext
+ * @return a new instance of a {@code JAXBContext}
* @throws JAXBException if an error was encountered while creating the
- * JAXBContext such as
+ * {@code JAXBContext} such as
*
* failure to locate either ObjectFactory.class or jaxb.index in the packages
* an ambiguity among global elements contained in the contextPath
@@ -472,8 +466,7 @@ public abstract class JAXBContext {
// TODO: resurrect this once we introduce external annotations
// /**
-// *
-// * Create a new instance of a JAXBContext class.
+// * Create a new instance of a {@code JAXBContext} class.
// *
// *
// * The client application must supply a list of classes that the new
@@ -484,8 +477,8 @@ public abstract class JAXBContext {
// * referenced statically from the specified classes.
// *
// * For example, in the following Java code, if you do
-// * newInstance(Foo.class) , the newly created {@link JAXBContext}
-// * will recognize both Foo and Bar , but not Zot :
+// * {@code newInstance(Foo.class)}, the newly created {@link JAXBContext}
+// * will recognize both {@code Foo} and {@code Bar}, but not {@code Zot}:
// *
// * class Foo {
// * Bar b;
@@ -509,11 +502,11 @@ public abstract class JAXBContext {
// * spec-defined classes will be returned.
// *
// * @return
-// * A new instance of a JAXBContext .
+// * A new instance of a {@code JAXBContext}.
// *
// * @throws JAXBException
// * if an error was encountered while creating the
-// * JAXBContext , such as (but not limited to):
+// * {@code JAXBContext}, such as (but not limited to):
// *
// * No JAXB implementation was discovered
// * Classes use JAXB annotations incorrectly
@@ -546,8 +539,7 @@ public abstract class JAXBContext {
// }
/**
- *
- * Create a new instance of a JAXBContext class.
+ * Create a new instance of a {@code JAXBContext} class.
*
*
* The client application must supply a list of classes that the new
@@ -556,12 +548,12 @@ public abstract class JAXBContext {
* Not only the new context will recognize all the classes specified,
* but it will also recognize any classes that are directly/indirectly
* referenced statically from the specified classes. Subclasses of
- * referenced classes nor @XmlTransient referenced classes
+ * referenced classes nor {@code @XmlTransient} referenced classes
* are not registered with JAXBContext.
*
* For example, in the following Java code, if you do
- * newInstance(Foo.class) , the newly created {@link JAXBContext}
- * will recognize both Foo and Bar , but not Zot or FooBar :
+ * {@code newInstance(Foo.class)}, the newly created {@link JAXBContext}
+ * will recognize both {@code Foo} and {@code Bar}, but not {@code Zot} or {@code FooBar}:
*
* class Foo {
* @XmlTransient FooBar c;
@@ -589,11 +581,11 @@ public abstract class JAXBContext {
* spec-defined classes will be returned.
*
* @return
- * A new instance of a JAXBContext .
+ * A new instance of a {@code JAXBContext}.
*
* @throws JAXBException
* if an error was encountered while creating the
- * JAXBContext , such as (but not limited to):
+ * {@code JAXBContext}, such as (but not limited to):
*
* No JAXB implementation was discovered
* Classes use JAXB annotations incorrectly
@@ -615,8 +607,7 @@ public abstract class JAXBContext {
}
/**
- *
- * Create a new instance of a JAXBContext class.
+ * Create a new instance of a {@code JAXBContext} class.
*
*
* An overloading of {@link JAXBContext#newInstance(Class...)}
@@ -624,7 +615,7 @@ public abstract class JAXBContext {
*
*
* The interpretation of properties is up to implementations. Implementations should
- * throw JAXBException if it finds properties that it doesn't understand.
+ * throw {@code JAXBException} if it finds properties that it doesn't understand.
*
* @param classesToBeBound
* list of java classes to be recognized by the new {@link JAXBContext}.
@@ -635,11 +626,11 @@ public abstract class JAXBContext {
* in an empty map.
*
* @return
- * A new instance of a JAXBContext .
+ * A new instance of a {@code JAXBContext}.
*
* @throws JAXBException
* if an error was encountered while creating the
- * JAXBContext , such as (but not limited to):
+ * {@code JAXBContext}, such as (but not limited to):
*
* No JAXB implementation was discovered
* Classes use JAXB annotations incorrectly
@@ -672,25 +663,25 @@ public abstract class JAXBContext {
}
/**
- * Create an Unmarshaller object that can be used to convert XML
+ * Create an {@code Unmarshaller} object that can be used to convert XML
* data into a java content tree.
*
- * @return an Unmarshaller object
+ * @return an {@code Unmarshaller} object
*
* @throws JAXBException if an error was encountered while creating the
- * Unmarshaller object
+ * {@code Unmarshaller} object
*/
public abstract Unmarshaller createUnmarshaller() throws JAXBException;
/**
- * Create a Marshaller object that can be used to convert a
+ * Create a {@code Marshaller} object that can be used to convert a
* java content tree into XML data.
*
- * @return a Marshaller object
+ * @return a {@code Marshaller} object
*
* @throws JAXBException if an error was encountered while creating the
- * Marshaller object
+ * {@code Marshaller} object
*/
public abstract Marshaller createMarshaller() throws JAXBException;
@@ -699,27 +690,27 @@ public abstract class JAXBContext {
* {@link Validator} has been made optional and deprecated in JAXB 2.0. Please
* refer to the javadoc for {@link Validator} for more detail.
*
- * Create a Validator object that can be used to validate a
+ * Create a {@code Validator} object that can be used to validate a
* java content tree against its source schema.
*
- * @return a Validator object
+ * @return a {@code Validator} object
*
* @throws JAXBException if an error was encountered while creating the
- * Validator object
+ * {@code Validator} object
* @deprecated since JAXB2.0
*/
public abstract Validator createValidator() throws JAXBException;
/**
- * Creates a Binder object that can be used for
+ * Creates a {@code Binder} object that can be used for
* associative/in-place unmarshalling/marshalling.
*
* @param domType select the DOM API to use by passing in its DOM Node class.
*
- * @return always a new valid Binder object.
+ * @return always a new valid {@code Binder} object.
*
* @throws UnsupportedOperationException
- * if DOM API corresponding to domType is not supported by
+ * if DOM API corresponding to {@code domType} is not supported by
* the implementation.
*
* @since 1.6, JAXB 2.0
@@ -731,9 +722,9 @@ public abstract class JAXBContext {
}
/**
- * Creates a Binder for W3C DOM.
+ * Creates a {@code Binder} for W3C DOM.
*
- * @return always a new valid Binder object.
+ * @return always a new valid {@code Binder} object.
*
* @since 1.6, JAXB 2.0
*/
@@ -742,11 +733,11 @@ public abstract class JAXBContext {
}
/**
- * Creates a JAXBIntrospector object that can be used to
+ * Creates a {@code JAXBIntrospector} object that can be used to
* introspect JAXB objects.
*
* @return
- * always return a non-null valid JAXBIntrospector object.
+ * always return a non-null valid {@code JAXBIntrospector} object.
*
* @throws UnsupportedOperationException
* Calling this method on JAXB 1.0 implementations will throw
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
index 57f80e44acd..4fc54e34dc4 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
@@ -239,7 +239,7 @@
For a property, a given annotation can be applied to
either read or write property but not both.
-
+
A property name must be different from any other
property name in any of the super classes of the
class being mapped.
@@ -250,8 +250,8 @@
Notations
Namespace prefixes
The following namespace prefixes are used in the XML Schema
- fragments in this package.
-
+ fragments in this package.
+
diff --git a/jdk/.hgtags b/jdk/.hgtags
index dc04435f09f..6a1fe8984b3 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -313,3 +313,4 @@ ed94f3e7ba6bbfec0772de6d24e39543e13f6d88 jdk9-b65
046fd17bb9a0cdf6681124866df9626d17b0516a jdk9-b68
551323004d0ce2f1d4b0e99552f7e0cdcebc6fca jdk9-b69
a7f731125b7fb0e4b0186172f85a21e2d5139f7e jdk9-b70
+e47d3bfbc61accc3fbd372a674fdce2933b54f31 jdk9-b71
diff --git a/jdk/make/CopySamples.gmk b/jdk/make/CopySamples.gmk
index 37a1d21ebce..be20f92fd17 100644
--- a/jdk/make/CopySamples.gmk
+++ b/jdk/make/CopySamples.gmk
@@ -28,7 +28,7 @@ default: all
include $(SPEC)
include MakeBase.gmk
-SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample
+SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample/image
SAMPLE_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/share
SAMPLE_CLOSED_SOURCE_DIR := $(JDK_TOPDIR)/src/closed/sample/share
SAMPLE_SOLARIS_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/solaris
diff --git a/jdk/make/copy/Copy-jdk.accessibility.gmk b/jdk/make/copy/Copy-jdk.accessibility.gmk
index 4c089c16883..ec8623765bc 100644
--- a/jdk/make/copy/Copy-jdk.accessibility.gmk
+++ b/jdk/make/copy/Copy-jdk.accessibility.gmk
@@ -31,17 +31,12 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
TARGETS += $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCallbacks.h \
$(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.h \
$(INCLUDE_DST_OS_DIR)/bridge/AccessBridgePackages.h \
- $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.c \
- $(CONF_DST_DIR)/accessibility.properties
+ $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgeCalls.c
$(INCLUDE_DST_OS_DIR)/bridge/%: \
$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
$(install-file)
- $(CONF_DST_DIR)/accessibility.properties: \
- $(JDK_TOPDIR)/src/jdk.accessibility/windows/conf/accessibility.properties
- $(install-file)
-
endif
################################################################################
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
index 19d5533385c..d6f6f158d1d 100644
--- a/jdk/make/data/tzdata/VERSION
+++ b/jdk/make/data/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2015d
+tzdata2015e
diff --git a/jdk/make/data/tzdata/africa b/jdk/make/data/tzdata/africa
index 6099a70f5e6..049861192cc 100644
--- a/jdk/make/data/tzdata/africa
+++ b/jdk/make/data/tzdata/africa
@@ -361,9 +361,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
# time this summer, and carry out studies on the possibility of canceling the
# practice altogether in future years."
#
-# From Paul Eggert (2015-04-20):
-# For now, assume DST will be canceled. Any resumption would likely
-# use different rules anyway.
+# From Paul Eggert (2015-04-24):
+# Yesterday the office of Egyptian President El-Sisi announced his
+# decision to abandon DST permanently. See Ahram Online 2015-04-24.
+# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
Rule Egypt 2008 only - Aug lastThu 24:00 0 -
Rule Egypt 2009 only - Aug 20 24:00 0 -
@@ -810,20 +811,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Paul Eggert (2014-06-05):
-# For now, guess that later spring and fall transitions will use 2014's rules,
+# From Milamber (2015-06-08):
+# (Google Translation) The hour will thus be delayed 60 minutes
+# Sunday, June 14 at 3:00, the ministry said in a statement, adding
+# that the time will be advanced again 60 minutes Sunday, July 19,
+# 2015 at 2:00. The move comes under 2.12.126 Decree of 26 Jumada I
+# 1433 (18 April 2012) and the decision of the Head of Government of
+# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
+# Source (french):
+# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+#
+# From Milamber (2015-06-09):
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
+#
+# From Michael Deckers (2015-06-09):
+# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
+# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
+# I think the patch is correct and the quoted text is wrong; the text in
+#
+#include
+
+/**
+ * Creates a CF string from the given Java string.
+ * If javaString is NULL, NULL is returned.
+ * If a memory error occurs, and OutOfMemoryError is thrown and
+ * NULL is returned.
+ */
+static CFStringRef toCFString(JNIEnv *env, jstring javaString)
+{
+ if (javaString == NULL) {
+ return NULL;
+ } else {
+ CFStringRef result = NULL;
+ jsize length = (*env)->GetStringLength(env, javaString);
+ const jchar *chars = (*env)->GetStringChars(env, javaString, NULL);
+ if (chars == NULL) {
+ JNU_ThrowOutOfMemoryError(env, "toCFString failed");
+ return NULL;
+ }
+ result = CFStringCreateWithCharacters(NULL, (const UniChar *)chars,
+ length);
+ (*env)->ReleaseStringChars(env, javaString, chars);
+ if (result == NULL) {
+ JNU_ThrowOutOfMemoryError(env, "toCFString failed");
+ return NULL;
+ }
+ return result;
+ }
+}
+
+/**
+ * Creates a Java string from the given CF string.
+ * If cfString is NULL, NULL is returned.
+ * If a memory error occurs, and OutOfMemoryError is thrown and
+ * NULL is returned.
+ */
+static jstring toJavaString(JNIEnv *env, CFStringRef cfString)
+{
+ if (cfString == NULL) {
+ return NULL;
+ } else {
+ jstring javaString = NULL;
+
+ CFIndex length = CFStringGetLength(cfString);
+ const UniChar *constchars = CFStringGetCharactersPtr(cfString);
+ if (constchars) {
+ javaString = (*env)->NewString(env, constchars, length);
+ } else {
+ UniChar *chars = malloc(length * sizeof(UniChar));
+ if (chars == NULL) {
+ JNU_ThrowOutOfMemoryError(env, "toJavaString failed");
+ return NULL;
+ }
+ CFStringGetCharacters(cfString, CFRangeMake(0, length), chars);
+ javaString = (*env)->NewString(env, chars, length);
+ free(chars);
+ }
+ return javaString;
+ }
+}
+
+/**
+ * Returns the content type corresponding to the supplied file extension.
+ * The mapping is determined using Uniform Type Identifiers (UTIs). If
+ * the file extension parameter is NULL, a CFString cannot be created
+ * from the file extension parameter, there is no UTI corresponding to
+ * the file extension, the UTI cannot supply a MIME type for the file
+ * extension, or a Java string cannot be created, then NULL is returned;
+ * otherwise the MIME type string is returned.
+ */
+JNIEXPORT jstring JNICALL
+Java_sun_nio_fs_UTIFileTypeDetector_probe0(JNIEnv* env, jobject ftd,
+ jstring ext)
+{
+ jstring result = NULL;
+
+ CFStringRef extension = toCFString(env, ext);
+ if (extension != NULL) {
+ CFStringRef uti =
+ UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension,
+ extension, NULL);
+ CFRelease(extension);
+
+ if (uti != NULL) {
+ CFStringRef mimeType =
+ UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType);
+ CFRelease(uti);
+
+ if (mimeType != NULL) {
+ result = toJavaString(env, mimeType);
+ CFRelease(mimeType);
+ }
+ }
+ }
+
+ return result;
+}
diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
index ee747c8e36c..dc42e6bbfd9 100644
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -62,14 +62,16 @@ final class GHASH {
private static final int AES_BLOCK_SIZE = 16;
- // Multiplies state0, state1 by V0, V1.
- private void blockMult(long V0, long V1) {
+ // Multiplies state[0], state[1] by subkeyH[0], subkeyH[1].
+ private static void blockMult(long[] st, long[] subH) {
long Z0 = 0;
long Z1 = 0;
+ long V0 = subH[0];
+ long V1 = subH[1];
long X;
- // Separate loops for processing state0 and state1.
- X = state0;
+ // Separate loops for processing state[0] and state[1].
+ X = st[0];
for (int i = 0; i < 64; i++) {
// Zi+1 = Zi if bit i of x is 0
long mask = X >> 63;
@@ -89,7 +91,7 @@ final class GHASH {
X <<= 1;
}
- X = state1;
+ X = st[1];
for (int i = 64; i < 127; i++) {
// Zi+1 = Zi if bit i of x is 0
long mask = X >> 63;
@@ -115,15 +117,18 @@ final class GHASH {
Z1 ^= V1 & mask;
// Save result.
- state0 = Z0;
- state1 = Z1;
+ st[0] = Z0;
+ st[1] = Z1;
+
}
+ /* subkeyH and state are stored in long[] for GHASH intrinsic use */
+
// hash subkey H; should not change after the object has been constructed
- private final long subkeyH0, subkeyH1;
+ private final long[] subkeyH;
// buffer for storing hash
- private long state0, state1;
+ private final long[] state;
// variables for save/restore calls
private long stateSave0, stateSave1;
@@ -141,8 +146,10 @@ final class GHASH {
if ((subkeyH == null) || subkeyH.length != AES_BLOCK_SIZE) {
throw new ProviderException("Internal error");
}
- this.subkeyH0 = getLong(subkeyH, 0);
- this.subkeyH1 = getLong(subkeyH, 8);
+ state = new long[2];
+ this.subkeyH = new long[2];
+ this.subkeyH[0] = getLong(subkeyH, 0);
+ this.subkeyH[1] = getLong(subkeyH, 8);
}
/**
@@ -151,33 +158,30 @@ final class GHASH {
* this object for different data w/ the same H.
*/
void reset() {
- state0 = 0;
- state1 = 0;
+ state[0] = 0;
+ state[1] = 0;
}
/**
* Save the current snapshot of this GHASH object.
*/
void save() {
- stateSave0 = state0;
- stateSave1 = state1;
+ stateSave0 = state[0];
+ stateSave1 = state[1];
}
/**
* Restores this object using the saved snapshot.
*/
void restore() {
- state0 = stateSave0;
- state1 = stateSave1;
+ state[0] = stateSave0;
+ state[1] = stateSave1;
}
- private void processBlock(byte[] data, int ofs) {
- if (data.length - ofs < AES_BLOCK_SIZE) {
- throw new RuntimeException("need complete block");
- }
- state0 ^= getLong(data, ofs);
- state1 ^= getLong(data, ofs + 8);
- blockMult(subkeyH0, subkeyH1);
+ private static void processBlock(byte[] data, int ofs, long[] st, long[] subH) {
+ st[0] ^= getLong(data, ofs);
+ st[1] ^= getLong(data, ofs + 8);
+ blockMult(st, subH);
}
void update(byte[] in) {
@@ -185,22 +189,57 @@ final class GHASH {
}
void update(byte[] in, int inOfs, int inLen) {
- if (inLen - inOfs > in.length) {
- throw new RuntimeException("input length out of bound");
+ if (inLen == 0) {
+ return;
+ }
+ ghashRangeCheck(in, inOfs, inLen, state, subkeyH);
+ processBlocks(in, inOfs, inLen/AES_BLOCK_SIZE, state, subkeyH);
+ }
+
+ private static void ghashRangeCheck(byte[] in, int inOfs, int inLen, long[] st, long[] subH) {
+ if (inLen < 0) {
+ throw new RuntimeException("invalid input length: " + inLen);
+ }
+ if (inOfs < 0) {
+ throw new RuntimeException("invalid offset: " + inOfs);
+ }
+ if (inLen > in.length - inOfs) {
+ throw new RuntimeException("input length out of bound: " +
+ inLen + " > " + (in.length - inOfs));
}
if (inLen % AES_BLOCK_SIZE != 0) {
- throw new RuntimeException("input length unsupported");
+ throw new RuntimeException("input length/block size mismatch: " +
+ inLen);
}
- for (int i = inOfs; i < (inOfs + inLen); i += AES_BLOCK_SIZE) {
- processBlock(in, i);
+ // These two checks are for C2 checking
+ if (st.length != 2) {
+ throw new RuntimeException("internal state has invalid length: " +
+ st.length);
+ }
+ if (subH.length != 2) {
+ throw new RuntimeException("internal subkeyH has invalid length: " +
+ subH.length);
+ }
+ }
+ /*
+ * This is an intrinsified method. The method's argument list must match
+ * the hotspot signature. This method and methods called by it, cannot
+ * throw exceptions or allocate arrays as it will breaking intrinsics
+ */
+ private static void processBlocks(byte[] data, int inOfs, int blocks, long[] st, long[] subH) {
+ int offset = inOfs;
+ while (blocks > 0) {
+ processBlock(data, offset, st, subH);
+ blocks--;
+ offset += AES_BLOCK_SIZE;
}
}
byte[] digest() {
byte[] result = new byte[AES_BLOCK_SIZE];
- putLong(result, 0, state0);
- putLong(result, 8, state1);
+ putLong(result, 0, state[0]);
+ putLong(result, 8, state[1]);
reset();
return result;
}
diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
index 1ea16cc62e1..49c6683f82d 100644
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -121,7 +121,7 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
} else if (data.isContextSpecific((byte) 0x01)) {
// mgf algid
AlgorithmId val = AlgorithmId.parse(data.data.getDerValue());
- if (!val.getOID().equals((Object) OID_MGF1)) {
+ if (!val.getOID().equals(OID_MGF1)) {
throw new IOException("Only MGF1 mgf is supported");
}
AlgorithmId params = AlgorithmId.parse(
@@ -144,7 +144,7 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
} else if (data.isContextSpecific((byte) 0x02)) {
// pSource algid
AlgorithmId val = AlgorithmId.parse(data.data.getDerValue());
- if (!val.getOID().equals((Object) OID_PSpecified)) {
+ if (!val.getOID().equals(OID_PSpecified)) {
throw new IOException("Wrong OID for pSpecified");
}
DerInputStream dis = new DerInputStream(val.getEncodedParams());
diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
index 19a7a08598e..2a4854a5649 100644
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
@@ -1235,7 +1235,7 @@ class Attribute implements Comparable {
int sofar = 0; // how far have we processed the layout?
for (;;) {
// for each dash, collect everything up to the dash
- result.append(layout.substring(sofar, dash));
+ result.append(layout, sofar, dash);
sofar = dash+1; // skip the dash
// then collect intermediate values
int value0 = parseIntBefore(layout, dash);
@@ -1249,7 +1249,7 @@ class Attribute implements Comparable {
dash = findCaseDash(layout, sofar);
if (dash < 0) break;
}
- result.append(layout.substring(sofar)); // collect the rest
+ result.append(layout, sofar, layout.length()); // collect the rest
return result.toString();
}
static {
diff --git a/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java b/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java
index f15f58df9c2..a2cb25532ac 100644
--- a/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java
+++ b/jdk/src/java.base/share/classes/java/io/BufferedOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -34,8 +34,7 @@ package java.io;
* @author Arthur van Hoff
* @since 1.0
*/
-public
-class BufferedOutputStream extends FilterOutputStream {
+public class BufferedOutputStream extends FilterOutputStream {
/**
* The internal buffer where data is stored.
*/
@@ -90,6 +89,7 @@ class BufferedOutputStream extends FilterOutputStream {
* @param b the byte to be written.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public synchronized void write(int b) throws IOException {
if (count >= buf.length) {
flushBuffer();
@@ -113,6 +113,7 @@ class BufferedOutputStream extends FilterOutputStream {
* @param len the number of bytes to write.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public synchronized void write(byte b[], int off, int len) throws IOException {
if (len >= buf.length) {
/* If the request length exceeds the size of the output buffer,
@@ -136,6 +137,7 @@ class BufferedOutputStream extends FilterOutputStream {
* @exception IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
+ @Override
public synchronized void flush() throws IOException {
flushBuffer();
out.flush();
diff --git a/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java b/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java
index 85e4dd1b281..4fb4e69362a 100644
--- a/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java
+++ b/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -41,13 +41,15 @@ package java.io;
* @author Jonathan Payne
* @since 1.0
*/
-public
-class FilterOutputStream extends OutputStream {
+public class FilterOutputStream extends OutputStream {
/**
* The underlying output stream to be filtered.
*/
protected OutputStream out;
+ /**
+ * Whether the stream is closed; implicitly initialized to false.
+ */
private boolean closed;
/**
@@ -75,6 +77,7 @@ class FilterOutputStream extends OutputStream {
* @param b the byte.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public void write(int b) throws IOException {
out.write(b);
}
@@ -95,6 +98,7 @@ class FilterOutputStream extends OutputStream {
* @exception IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#write(byte[], int, int)
*/
+ @Override
public void write(byte b[]) throws IOException {
write(b, 0, b.length);
}
@@ -119,6 +123,7 @@ class FilterOutputStream extends OutputStream {
* @exception IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#write(int)
*/
+ @Override
public void write(byte b[], int off, int len) throws IOException {
if ((off | len | (b.length - (len + off)) | (off + len)) < 0)
throw new IndexOutOfBoundsException();
@@ -138,6 +143,7 @@ class FilterOutputStream extends OutputStream {
* @exception IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
+ @Override
public void flush() throws IOException {
out.flush();
}
@@ -154,13 +160,40 @@ class FilterOutputStream extends OutputStream {
* @see java.io.FilterOutputStream#flush()
* @see java.io.FilterOutputStream#out
*/
- @SuppressWarnings("try")
+ @Override
public void close() throws IOException {
- if (closed)
+ if (closed) {
return;
+ }
closed = true;
- try (OutputStream ostream = out) {
+
+ Throwable flushException = null;
+ try {
flush();
+ } catch (Throwable e) {
+ flushException = e;
+ throw e;
+ } finally {
+ if (flushException == null) {
+ out.close();
+ } else {
+ try {
+ out.close();
+ } catch (Throwable closeException) {
+ // evaluate possible precedence of flushException over closeException
+ if ((flushException instanceof ThreadDeath) &&
+ !(closeException instanceof ThreadDeath)) {
+ flushException.addSuppressed(closeException);
+ throw (ThreadDeath) flushException;
+ }
+
+ if (flushException != closeException) {
+ closeException.addSuppressed(flushException);
+ }
+
+ throw closeException;
+ }
+ }
}
}
}
diff --git a/jdk/src/java.base/share/classes/java/io/StringWriter.java b/jdk/src/java.base/share/classes/java/io/StringWriter.java
index 63ca2f0e0f2..c62d82f4ea8 100644
--- a/jdk/src/java.base/share/classes/java/io/StringWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/StringWriter.java
@@ -109,7 +109,7 @@ public class StringWriter extends Writer {
* @param len Number of characters to write
*/
public void write(String str, int off, int len) {
- buf.append(str.substring(off, off + len));
+ buf.append(str, off, off + len);
}
/**
diff --git a/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index 93b1093df7b..a9216000731 100644
--- a/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/jdk/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -515,8 +515,12 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
+ s.length());
int len = end - start;
ensureCapacityInternal(count + len);
- for (int i = start, j = count; i < end; i++, j++)
- value[j] = s.charAt(i);
+ if (s instanceof String) {
+ ((String)s).getChars(start, end, value, count);
+ } else {
+ for (int i = start, j = count; i < end; i++, j++)
+ value[j] = s.charAt(i);
+ }
count += len;
return this;
}
diff --git a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java
index 3376bafdf20..81da1c0cf8f 100644
--- a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java
+++ b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,10 +25,14 @@
package java.net;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.NoSuchElementException;
-import sun.security.action.*;
import java.security.AccessController;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
/**
* This class represents a Network Interface made up of a name,
@@ -95,8 +99,8 @@ public final class NetworkInterface {
}
/**
- * Convenience method to return an Enumeration with all or a
- * subset of the InetAddresses bound to this network interface.
+ * Get an Enumeration with all or a subset of the InetAddresses bound to
+ * this network interface.
*
* If there is a security manager, its {@code checkConnect}
* method is called for each InetAddress. Only InetAddresses where
@@ -104,53 +108,56 @@ public final class NetworkInterface {
* will be returned in the Enumeration. However, if the caller has the
* {@link NetPermission}("getNetworkInformation") permission, then all
* InetAddresses are returned.
+ *
* @return an Enumeration object with all or a subset of the InetAddresses
* bound to this network interface
+ * @see #inetAddresses()
*/
public Enumeration getInetAddresses() {
+ return enumerationFromArray(getCheckedInetAddresses());
+ }
- class checkedAddresses implements Enumeration {
+ /**
+ * Get a Stream of all or a subset of the InetAddresses bound to this
+ * network interface.
+ *
+ * If there is a security manager, its {@code checkConnect}
+ * method is called for each InetAddress. Only InetAddresses where
+ * the {@code checkConnect} doesn't throw a SecurityException will be
+ * returned in the Stream. However, if the caller has the
+ * {@link NetPermission}("getNetworkInformation") permission, then all
+ * InetAddresses are returned.
+ *
+ * @return a Stream object with all or a subset of the InetAddresses
+ * bound to this network interface
+ * @since 1.9
+ */
+ public Stream inetAddresses() {
+ return streamFromArray(getCheckedInetAddresses());
+ }
- private int i=0, count=0;
- private InetAddress local_addrs[];
+ private InetAddress[] getCheckedInetAddresses() {
+ InetAddress[] local_addrs = new InetAddress[addrs.length];
+ boolean trusted = true;
- checkedAddresses() {
- local_addrs = new InetAddress[addrs.length];
- boolean trusted = true;
-
- SecurityManager sec = System.getSecurityManager();
- if (sec != null) {
- try {
- sec.checkPermission(new NetPermission("getNetworkInformation"));
- } catch (SecurityException e) {
- trusted = false;
- }
- }
- for (int j=0; j getSubInterfaces() {
- class subIFs implements Enumeration {
-
- private int i=0;
-
- subIFs() {
- }
-
- public NetworkInterface nextElement() {
- if (i < childs.length) {
- return childs[i++];
- } else {
- throw new NoSuchElementException();
- }
- }
-
- public boolean hasMoreElements() {
- return (i < childs.length);
- }
- }
- return new subIFs();
+ return enumerationFromArray(childs);
+ }
+ /**
+ * Get a Stream of all subinterfaces (also known as virtual
+ * interfaces) attached to this network interface.
+ *
+ * @return a Stream object with all of the subinterfaces
+ * of this network interface
+ * @since 1.9
+ */
+ public Stream subInterfaces() {
+ return streamFromArray(childs);
}
/**
@@ -326,43 +326,80 @@ public final class NetworkInterface {
}
/**
- * Returns all the interfaces on this machine. The {@code Enumeration}
- * contains at least one element, possibly representing a loopback
- * interface that only supports communication between entities on
+ * Returns an {@code Enumeration} of all the interfaces on this machine. The
+ * {@code Enumeration} contains at least one element, possibly representing
+ * a loopback interface that only supports communication between entities on
* this machine.
*
- * NOTE: can use getNetworkInterfaces()+getInetAddresses()
- * to obtain all IP addresses for this node
+ * @apiNote this method can be used in combination with
+ * {@link #getInetAddresses()} to obtain all IP addresses for this node
*
* @return an Enumeration of NetworkInterfaces found on this machine
* @exception SocketException if an I/O error occurs.
+ * @see #networkInterfaces()
*/
-
public static Enumeration getNetworkInterfaces()
throws SocketException {
- final NetworkInterface[] netifs = getAll();
+ NetworkInterface[] netifs = getAll();
+ assert netifs != null && netifs.length > 0;
- // specified to return null if no network interfaces
- if (netifs == null)
- return null;
+ return enumerationFromArray(netifs);
+ }
+ /**
+ * Returns a {@code Stream} of all the interfaces on this machine. The
+ * {@code Stream} contains at least one interface, possibly representing a
+ * loopback interface that only supports communication between entities on
+ * this machine.
+ *
+ * @apiNote this method can be used in combination with
+ * {@link #inetAddresses()}} to obtain a stream of all IP addresses for
+ * this node, for example:
+ * {@code
+ * Stream addrs = NetworkInterface.networkInterfaces()
+ * .flatMap(NetworkInterface::inetAddresses);
+ * }
+ *
+ * @return a Stream of NetworkInterfaces found on this machine
+ * @exception SocketException if an I/O error occurs.
+ * @since 1.9
+ */
+ public static Stream networkInterfaces()
+ throws SocketException {
+ NetworkInterface[] netifs = getAll();
+ assert netifs != null && netifs.length > 0;
+
+ return streamFromArray(netifs);
+ }
+
+ private static Enumeration enumerationFromArray(T[] a) {
return new Enumeration<>() {
- private int i = 0;
- public NetworkInterface nextElement() {
- if (netifs != null && i < netifs.length) {
- NetworkInterface netif = netifs[i++];
- return netif;
+ int i = 0;
+
+ @Override
+ public T nextElement() {
+ if (i < a.length) {
+ return a[i++];
} else {
throw new NoSuchElementException();
}
}
+ @Override
public boolean hasMoreElements() {
- return (netifs != null && i < netifs.length);
+ return i < a.length;
}
};
}
+ private static Stream streamFromArray(T[] a) {
+ return StreamSupport.stream(
+ Spliterators.spliterator(
+ a,
+ Spliterator.DISTINCT | Spliterator.IMMUTABLE | Spliterator.NONNULL),
+ false);
+ }
+
private native static NetworkInterface[] getAll()
throws SocketException;
diff --git a/jdk/src/java.base/share/classes/java/net/URI.java b/jdk/src/java.base/share/classes/java/net/URI.java
index 89a9d50e52a..2896cf222e6 100644
--- a/jdk/src/java.base/share/classes/java/net/URI.java
+++ b/jdk/src/java.base/share/classes/java/net/URI.java
@@ -2018,7 +2018,7 @@ public final class URI
StringBuilder sb = new StringBuilder(base.length() + cn);
// 5.2 (6a)
if (i >= 0)
- sb.append(base.substring(0, i + 1));
+ sb.append(base, 0, i + 1);
// 5.2 (6b)
sb.append(child);
path = sb.toString();
@@ -2686,7 +2686,7 @@ public final class URI
if (!match(c, lowMask, highMask)) {
if (sb == null) {
sb = new StringBuffer();
- sb.append(s.substring(0, i));
+ sb.append(s, 0, i);
}
appendEscape(sb, (byte)c);
} else {
@@ -2698,7 +2698,7 @@ public final class URI
|| Character.isISOControl(c))) {
if (sb == null) {
sb = new StringBuffer();
- sb.append(s.substring(0, i));
+ sb.append(s, 0, i);
}
appendEncoded(sb, c);
} else {
diff --git a/jdk/src/java.base/share/classes/java/security/PermissionCollection.java b/jdk/src/java.base/share/classes/java/security/PermissionCollection.java
index 3f13b9f93d5..0aa6ce74bc4 100644
--- a/jdk/src/java.base/share/classes/java/security/PermissionCollection.java
+++ b/jdk/src/java.base/share/classes/java/security/PermissionCollection.java
@@ -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,8 @@
package java.security;
import java.util.*;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
/**
* Abstract class representing a collection of Permission objects.
@@ -126,9 +128,34 @@ public abstract class PermissionCollection implements java.io.Serializable {
* Returns an enumeration of all the Permission objects in the collection.
*
* @return an enumeration of all the Permissions.
+ * @see #elementsAsStream()
*/
public abstract Enumeration elements();
+ /**
+ * Returns a stream of all the Permission objects in the collection.
+ *
+ * The collection should not be modified (see {@link #add}) during the
+ * execution of the terminal stream operation. Otherwise, the result of the
+ * terminal stream operation is undefined.
+ *
+ * @implSpec
+ * The default implementation creates a stream whose source is derived from
+ * the enumeration returned from a call to {@link #elements()}.
+ *
+ * @return a stream of all the Permissions.
+ * @since 1.9
+ */
+ public Stream elementsAsStream() {
+ int characteristics = isReadOnly()
+ ? Spliterator.NONNULL | Spliterator.IMMUTABLE
+ : Spliterator.NONNULL;
+ return StreamSupport.stream(
+ Spliterators.spliteratorUnknownSize(
+ elements().asIterator(), characteristics),
+ false);
+ }
+
/**
* Marks this PermissionCollection object as "readonly". After
* a PermissionCollection object
diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
index a498bbefc5f..ba13f3cdb2a 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -2238,7 +2238,7 @@ public class X509CertSelector implements CertSelector {
+ subjectPublicKeyAlgID + ", xcert subjectPublicKeyAlgID = "
+ algID.getOID());
}
- if (!subjectPublicKeyAlgID.equals((Object)algID.getOID())) {
+ if (!subjectPublicKeyAlgID.equals(algID.getOID())) {
if (debug != null) {
debug.println("X509CertSelector.match: "
+ "subject public key alg IDs don't match");
diff --git a/jdk/src/java.base/share/classes/java/text/MergeCollation.java b/jdk/src/java.base/share/classes/java/text/MergeCollation.java
index bd541a58afb..4e5e5a53ae0 100644
--- a/jdk/src/java.base/share/classes/java/text/MergeCollation.java
+++ b/jdk/src/java.base/share/classes/java/text/MergeCollation.java
@@ -329,8 +329,8 @@ final class MergeCollation {
PatternEntry e = patterns.get(i);
if (e.chars.regionMatches(0,entry.chars,0,
e.chars.length())) {
- excessChars.append(entry.chars.substring(e.chars.length(),
- entry.chars.length()));
+ excessChars.append(entry.chars, e.chars.length(),
+ entry.chars.length());
break;
}
}
diff --git a/jdk/src/java.base/share/classes/java/text/MessageFormat.java b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
index 2497a490eb0..5239db0c119 100644
--- a/jdk/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1239,7 +1239,7 @@ public class MessageFormat extends Format {
int lastOffset = 0;
int last = result.length();
for (int i = 0; i <= maxOffset; ++i) {
- result.append(pattern.substring(lastOffset, offsets[i]));
+ result.append(pattern, lastOffset, offsets[i]);
lastOffset = offsets[i];
int argumentNumber = argumentNumbers[i];
if (arguments == null || argumentNumber >= arguments.length) {
@@ -1332,7 +1332,7 @@ public class MessageFormat extends Format {
}
}
}
- result.append(pattern.substring(lastOffset, pattern.length()));
+ result.append(pattern, lastOffset, pattern.length());
if (characterIterators != null && last != result.length()) {
characterIterators.add(createAttributedCharacterIterator(
result.substring(last)));
diff --git a/jdk/src/java.base/share/classes/java/util/Collections.java b/jdk/src/java.base/share/classes/java/util/Collections.java
index ce4ae7d1b97..6ae9a2feb16 100644
--- a/jdk/src/java.base/share/classes/java/util/Collections.java
+++ b/jdk/src/java.base/share/classes/java/util/Collections.java
@@ -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
@@ -4268,6 +4268,7 @@ public class Collections {
public boolean hasMoreElements() { return false; }
public E nextElement() { throw new NoSuchElementException(); }
+ public Iterator asIterator() { return emptyIterator(); }
}
/**
@@ -5199,6 +5200,11 @@ public class Collections {
* interoperability with legacy APIs that require an enumeration
* as input.
*
+ * The iterator returned from a call to {@link Enumeration#asIterator()}
+ * does not support removal of elements from the specified collection. This
+ * is necessary to avoid unintentionally increasing the capabilities of the
+ * returned enumeration.
+ *
* @param the class of the objects in the collection
* @param c the collection for which an enumeration is to be returned.
* @return an enumeration over the specified collection.
diff --git a/jdk/src/java.base/share/classes/java/util/LinkedList.java b/jdk/src/java.base/share/classes/java/util/LinkedList.java
index 343ded84d07..e2e57e8d5a2 100644
--- a/jdk/src/java.base/share/classes/java/util/LinkedList.java
+++ b/jdk/src/java.base/share/classes/java/util/LinkedList.java
@@ -88,18 +88,22 @@ public class LinkedList
/**
* Pointer to first node.
- * Invariant: (first == null && last == null) ||
- * (first.prev == null && first.item != null)
*/
transient Node first;
/**
* Pointer to last node.
- * Invariant: (first == null && last == null) ||
- * (last.next == null && last.item != null)
*/
transient Node last;
+ /*
+ void dataStructureInvariants() {
+ assert (size == 0)
+ ? (first == null && last == null)
+ : (first.prev == null && last.next == null);
+ }
+ */
+
/**
* Constructs an empty list.
*/
diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
index f565bc02361..bc8c24c453e 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -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
@@ -265,6 +265,10 @@ class JarFile extends ZipFile {
public JarEntry nextElement() {
return next();
}
+
+ public Iterator asIterator() {
+ return this;
+ }
}
/**
diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
index 8669158bbc9..a4aa9b39d70 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -526,6 +526,10 @@ class ZipFile implements ZipConstants, Closeable {
return ze;
}
}
+
+ public Iterator asIterator() {
+ return this;
+ }
}
/**
diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java
index fa34d2bbb6f..9bebac8f64b 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeName.java
@@ -511,7 +511,7 @@ public class BytecodeName {
if (s.charAt(0) != ESCAPE_C && i > 0)
sb.append(NULL_ESCAPE);
// append the string so far, which is unremarkable:
- sb.append(s.substring(0, i));
+ sb.append(s, 0, i);
}
// rewrite \ to \-, / to \|, etc.
@@ -544,7 +544,7 @@ public class BytecodeName {
if (sb == null) {
sb = new StringBuilder(s.length());
// append the string so far, which is unremarkable:
- sb.append(s.substring(stringStart, i));
+ sb.append(s, stringStart, i);
}
++i; // skip both characters
c = oc;
diff --git a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
index 1c9abf9d1f4..52af2cb6510 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
@@ -451,7 +451,7 @@ public class ParseUtil {
if (!match(c, lowMask, highMask) && !isEscaped(s, i)) {
if (sb == null) {
sb = new StringBuffer();
- sb.append(s.substring(0, i));
+ sb.append(s, 0, i);
}
appendEscape(sb, (byte)c);
} else {
@@ -463,7 +463,7 @@ public class ParseUtil {
|| Character.isISOControl(c))) {
if (sb == null) {
sb = new StringBuffer();
- sb.append(s.substring(0, i));
+ sb.append(s, 0, i);
}
appendEncoded(sb, c);
} else {
diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
index 0e43486e215..4b4e623275c 100644
--- a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
+++ b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -41,6 +41,27 @@ public abstract class AbstractFileTypeDetector
super();
}
+ /**
+ * Returns the extension of a file name, specifically the portion of the
+ * parameter string after the first dot. If the parameter is {@code null},
+ * empty, does not contain a dot, or the dot is the last character, then an
+ * empty string is returned, otherwise the characters after the dot are
+ * returned.
+ *
+ * @param name A file name
+ * @return The characters after the first dot or an empty string.
+ */
+ protected final String getExtension(String name) {
+ String ext = "";
+ if (name != null && !name.isEmpty()) {
+ int dot = name.indexOf('.');
+ if ((dot >= 0) && (dot < name.length() - 1)) {
+ ext = name.substring(dot + 1);
+ }
+ }
+ return ext;
+ }
+
/**
* Invokes the appropriate probe method to guess a file's content type,
* and checks that the content type's syntax is valid.
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
index bc78d0f1c0d..47a64dbfb79 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -163,9 +163,9 @@ public class ContentInfo {
}
public byte[] getData() throws IOException {
- if (contentType.equals((Object)DATA_OID) ||
- contentType.equals((Object)OLD_DATA_OID) ||
- contentType.equals((Object)TIMESTAMP_TOKEN_INFO_OID)) {
+ if (contentType.equals(DATA_OID) ||
+ contentType.equals(OLD_DATA_OID) ||
+ contentType.equals(TIMESTAMP_TOKEN_INFO_OID)) {
if (content == null)
return null;
else
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
index 52d7b18bcc4..d525a617ada 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -182,13 +182,12 @@ public class PKCS7 {
contentType = contentInfo.contentType;
DerValue content = contentInfo.getContent();
- if (contentType.equals((Object)ContentInfo.SIGNED_DATA_OID)) {
+ if (contentType.equals(ContentInfo.SIGNED_DATA_OID)) {
parseSignedData(content);
- } else if (contentType.equals((Object)ContentInfo.OLD_SIGNED_DATA_OID)) {
+ } else if (contentType.equals(ContentInfo.OLD_SIGNED_DATA_OID)) {
// This is for backwards compatibility with JDK 1.1.x
parseOldSignedData(content);
- } else if (contentType.equals((Object)
- ContentInfo.NETSCAPE_CERT_SEQUENCE_OID)){
+ } else if (contentType.equals(ContentInfo.NETSCAPE_CERT_SEQUENCE_OID)){
parseNetscapeCertChain(content);
} else {
throw new ParsingException("content type " + contentType +
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java b/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
index 1f310a2d32f..12b72de51e5 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -307,7 +307,7 @@ public class SignerInfo implements DerEncoder {
authenticatedAttributes.getAttributeValue(
PKCS9Attribute.CONTENT_TYPE_OID);
if (contentType == null ||
- !contentType.equals((Object)content.contentType))
+ !contentType.equals(content.contentType))
return null; // contentType does not match, bad SignerInfo
// now, check message digest
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
index 625d31115a9..d5755edb12d 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -789,7 +789,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
}
}
if (params != null) {
- if (algorithm.equals((Object)pbes2_OID)) {
+ if (algorithm.equals(pbes2_OID)) {
algParams = AlgorithmParameters.getInstance("PBES2");
} else {
algParams = AlgorithmParameters.getInstance("PBE");
@@ -926,7 +926,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
private static String mapPBEParamsToAlgorithm(ObjectIdentifier algorithm,
AlgorithmParameters algParams) throws NoSuchAlgorithmException {
// Check for PBES2 algorithms
- if (algorithm.equals((Object)pbes2_OID) && algParams != null) {
+ if (algorithm.equals(pbes2_OID) && algParams != null) {
return algParams.toString();
}
return algorithm.toString();
@@ -1937,7 +1937,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
ContentInfo authSafe = new ContentInfo(s);
ObjectIdentifier contentType = authSafe.getContentType();
- if (contentType.equals((Object)ContentInfo.DATA_OID)) {
+ if (contentType.equals(ContentInfo.DATA_OID)) {
authSafeData = authSafe.getData();
} else /* signed data */ {
throw new IOException("public key protected PKCS12 not supported");
@@ -1965,14 +1965,14 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
safeContents = new ContentInfo(sci);
contentType = safeContents.getContentType();
safeContentsData = null;
- if (contentType.equals((Object)ContentInfo.DATA_OID)) {
+ if (contentType.equals(ContentInfo.DATA_OID)) {
if (debug != null) {
debug.println("Loading PKCS#7 data content-type");
}
safeContentsData = safeContents.getData();
- } else if (contentType.equals((Object)ContentInfo.ENCRYPTED_DATA_OID)) {
+ } else if (contentType.equals(ContentInfo.ENCRYPTED_DATA_OID)) {
if (password == null) {
if (debug != null) {
@@ -2178,12 +2178,12 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
+ bagValue.tag);
}
bagValue = bagValue.data.getDerValue();
- if (bagId.equals((Object)PKCS8ShroudedKeyBag_OID)) {
+ if (bagId.equals(PKCS8ShroudedKeyBag_OID)) {
PrivateKeyEntry kEntry = new PrivateKeyEntry();
kEntry.protectedPrivKey = bagValue.toByteArray();
bagItem = kEntry;
privateKeyCount++;
- } else if (bagId.equals((Object)CertBag_OID)) {
+ } else if (bagId.equals(CertBag_OID)) {
DerInputStream cs = new DerInputStream(bagValue.toByteArray());
DerValue[] certValues = cs.getSequence(2);
ObjectIdentifier certId = certValues[0].getOID();
@@ -2198,7 +2198,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
(new ByteArrayInputStream(certValue.getOctetString()));
bagItem = cert;
certificateCount++;
- } else if (bagId.equals((Object)SecretBag_OID)) {
+ } else if (bagId.equals(SecretBag_OID)) {
DerInputStream ss = new DerInputStream(bagValue.toByteArray());
DerValue[] secretValues = ss.getSequence(2);
ObjectIdentifier secretId = secretValues[0].getOID();
@@ -2249,12 +2249,12 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
throw new IOException("Attribute " + attrId +
" should have a value " + e.getMessage());
}
- if (attrId.equals((Object)PKCS9FriendlyName_OID)) {
+ if (attrId.equals(PKCS9FriendlyName_OID)) {
alias = valSet[0].getBMPString();
- } else if (attrId.equals((Object)PKCS9LocalKeyId_OID)) {
+ } else if (attrId.equals(PKCS9LocalKeyId_OID)) {
keyId = valSet[0].getOctetString();
} else if
- (attrId.equals((Object)TrustedKeyUsage_OID)) {
+ (attrId.equals(TrustedKeyUsage_OID)) {
trustedKeyUsage = new ObjectIdentifier[valSet.length];
for (int k = 0; k < valSet.length; k++) {
trustedKeyUsage[k] = valSet[k].getOID();
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java
index dce8fd6b934..55186949e48 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -322,7 +322,7 @@ public final class OCSP {
List descriptions = aia.getAccessDescriptions();
for (AccessDescription description : descriptions) {
- if (description.getAccessMethod().equals((Object)
+ if (description.getAccessMethod().equals(
AccessDescription.Ad_OCSP_Id)) {
GeneralName generalName = description.getAccessLocation();
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
index f8e72abebc0..02c669e63c4 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
@@ -239,7 +239,7 @@ public final class OCSPResponse {
// responseType
derIn = tmp.data;
ObjectIdentifier responseType = derIn.getOID();
- if (responseType.equals((Object)OCSP_BASIC_RESPONSE_OID)) {
+ if (responseType.equals(OCSP_BASIC_RESPONSE_OID)) {
if (debug != null) {
debug.println("OCSP response type: basic");
}
@@ -338,8 +338,7 @@ public final class OCSPResponse {
debug.println("OCSP extension: " + ext);
}
// Only the NONCE extension is recognized
- if (ext.getExtensionId().equals((Object)
- OCSP.NONCE_EXTENSION_OID))
+ if (ext.getExtensionId().equals(OCSP.NONCE_EXTENSION_OID))
{
nonce = ext.getExtensionValue();
} else if (ext.isCritical()) {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
index 0477b2b751e..f1900f8824b 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
@@ -202,7 +202,7 @@ class URICertStore extends CertStoreSpi {
* object of a certificate's Authority Information Access Extension.
*/
static CertStore getInstance(AccessDescription ad) {
- if (!ad.getAccessMethod().equals((Object)
+ if (!ad.getAccessMethod().equals(
AccessDescription.Ad_CAISSUERS_Id)) {
return null;
}
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
index d5ba1f82621..6d43d1e32a3 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
@@ -232,7 +232,7 @@ public abstract class RSASignature extends SignatureSpi {
throw new IOException("SEQUENCE length error");
}
AlgorithmId algId = AlgorithmId.parse(values[0]);
- if (algId.getOID().equals((Object)oid) == false) {
+ if (algId.getOID().equals(oid) == false) {
throw new IOException("ObjectIdentifier mismatch: "
+ algId.getOID());
}
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 0ce7ef42ae0..dcf276bf60e 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1280,7 +1280,7 @@ public final class Main {
Iterator attrs = req.getAttributes().getAttributes().iterator();
while (attrs.hasNext()) {
PKCS10Attribute attr = attrs.next();
- if (attr.getAttributeId().equals((Object)PKCS9Attribute.EXTENSION_REQUEST_OID)) {
+ if (attr.getAttributeId().equals(PKCS9Attribute.EXTENSION_REQUEST_OID)) {
reqex = (CertificateExtensions)attr.getAttributeValue();
}
}
@@ -2338,7 +2338,7 @@ public final class Main {
req.getSubjectName(), pkey.getFormat(), pkey.getAlgorithm());
for (PKCS10Attribute attr: req.getAttributes().getAttributes()) {
ObjectIdentifier oid = attr.getAttributeId();
- if (oid.equals((Object)PKCS9Attribute.EXTENSION_REQUEST_OID)) {
+ if (oid.equals(PKCS9Attribute.EXTENSION_REQUEST_OID)) {
CertificateExtensions exts = (CertificateExtensions)attr.getAttributeValue();
if (exts != null) {
printExtensions(rb.getString("Extension.Request."), exts, out);
diff --git a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
index 9d02a42101f..5e8c6e0b1ae 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -318,14 +318,6 @@ class ObjectIdentifier implements Serializable
out.write (DerValue.tag_ObjectId, encoding);
}
- /**
- * @deprecated Use equals((Object)oid)
- */
- @Deprecated
- public boolean equals(ObjectIdentifier other) {
- return equals((Object)other);
- }
-
/**
* Compares this identifier with another, for equality.
*
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
index c75030a21a7..b7b98d3da0e 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -364,8 +364,8 @@ public class AVA implements DerEncoder {
// encode as PrintableString unless value contains
// non-PrintableString chars
- if (this.oid.equals((Object)PKCS9Attribute.EMAIL_ADDRESS_OID) ||
- (this.oid.equals((Object)X500Name.DOMAIN_COMPONENT_OID) &&
+ if (this.oid.equals(PKCS9Attribute.EMAIL_ADDRESS_OID) ||
+ (this.oid.equals(X500Name.DOMAIN_COMPONENT_OID) &&
PRESERVE_OLD_DC_ENCODING == false)) {
// EmailAddress and DomainComponent must be IA5String
return new DerValue(DerValue.tag_IA5String,
@@ -495,8 +495,8 @@ public class AVA implements DerEncoder {
// encode as PrintableString unless value contains
// non-PrintableString chars
- if (this.oid.equals((Object)PKCS9Attribute.EMAIL_ADDRESS_OID) ||
- (this.oid.equals((Object)X500Name.DOMAIN_COMPONENT_OID) &&
+ if (this.oid.equals(PKCS9Attribute.EMAIL_ADDRESS_OID) ||
+ (this.oid.equals(X500Name.DOMAIN_COMPONENT_OID) &&
PRESERVE_OLD_DC_ENCODING == false)) {
// EmailAddress and DomainComponent must be IA5String
return new DerValue(DerValue.tag_IA5String, temp.toString());
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java b/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java
index fbf4bed3a37..45fa695e88c 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AccessDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -95,19 +95,19 @@ public final class AccessDescription {
if (this == that) {
return true;
}
- return (accessMethod.equals((Object)that.getAccessMethod()) &&
+ return (accessMethod.equals(that.getAccessMethod()) &&
accessLocation.equals(that.getAccessLocation()));
}
public String toString() {
String method = null;
- if (accessMethod.equals((Object)Ad_CAISSUERS_Id)) {
+ if (accessMethod.equals(Ad_CAISSUERS_Id)) {
method = "caIssuers";
- } else if (accessMethod.equals((Object)Ad_CAREPOSITORY_Id)) {
+ } else if (accessMethod.equals(Ad_CAREPOSITORY_Id)) {
method = "caRepository";
- } else if (accessMethod.equals((Object)Ad_TIMESTAMPING_Id)) {
+ } else if (accessMethod.equals(Ad_TIMESTAMPING_Id)) {
method = "timeStamping";
- } else if (accessMethod.equals((Object)Ad_OCSP_Id)) {
+ } else if (accessMethod.equals(Ad_OCSP_Id)) {
method = "ocsp";
} else {
method = accessMethod.toString();
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java
index 8471be38ae1..a3a0fe187bb 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CertificateExtensions.java
@@ -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
@@ -241,7 +241,7 @@ public class CertificateExtensions implements CertAttrSet {
public String getNameByOid(ObjectIdentifier oid) throws IOException {
for (String name: map.keySet()) {
- if (map.get(name).getExtensionId().equals((Object)oid)) {
+ if (map.get(name).getExtensionId().equals(oid)) {
return name;
}
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java
index 5f281bfc8f5..8a2f625dda3 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/CertificatePolicyId.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, 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
@@ -93,8 +93,7 @@ public class CertificatePolicyId {
*/
public boolean equals(Object other) {
if (other instanceof CertificatePolicyId)
- return id.equals((Object)
- ((CertificatePolicyId) other).getIdentifier());
+ return id.equals(((CertificatePolicyId) other).getIdentifier());
else
return false;
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
index d3a711e4b5e..5649d2a1206 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/Extension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, 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
@@ -264,7 +264,7 @@ public class Extension implements java.security.cert.Extension {
Extension otherExt = (Extension) other;
if (critical != otherExt.critical)
return false;
- if (!extensionId.equals((Object)otherExt.extensionId))
+ if (!extensionId.equals(otherExt.extensionId))
return false;
return Arrays.equals(extensionValue, otherExt.extensionValue);
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
index 4d1e4cdd126..eafe3eefe78 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/NameConstraintsExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, 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
@@ -579,7 +579,7 @@ implements CertAttrSet, Cloneable {
public boolean verifyRFC822SpecialCase(X500Name subject) throws IOException {
for (AVA ava : subject.allAvas()) {
ObjectIdentifier attrOID = ava.getObjectIdentifier();
- if (attrOID.equals((Object)PKCS9Attribute.EMAIL_ADDRESS_OID)) {
+ if (attrOID.equals(PKCS9Attribute.EMAIL_ADDRESS_OID)) {
String attrValue = ava.getValueString();
if (attrValue != null) {
RFC822Name emailName;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
index b5435eb0653..6db9d11e2d3 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, 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
@@ -120,7 +120,7 @@ public class OIDName implements GeneralNameInterface {
OIDName other = (OIDName)obj;
- return oid.equals((Object)other.oid);
+ return oid.equals(other.oid);
}
/**
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
index 5b73fb1a176..0a2842a00be 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OtherName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -176,7 +176,7 @@ public class OtherName implements GeneralNameInterface {
return false;
}
OtherName otherOther = (OtherName)other;
- if (!(otherOther.oid.equals((Object)oid))) {
+ if (!(otherOther.oid.equals(oid))) {
return false;
}
GeneralNameInterface otherGNI = null;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
index 6ba421d3b27..6e927c4a340 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/RDN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -321,7 +321,7 @@ public class RDN {
*/
DerValue findAttribute(ObjectIdentifier oid) {
for (int i = 0; i < assertion.length; i++) {
- if (assertion[i].oid.equals((Object)oid)) {
+ if (assertion[i].oid.equals(oid)) {
return assertion[i].value;
}
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
index 8646b43841a..d92da97e1db 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
@@ -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
@@ -414,7 +414,7 @@ public class X509CRLEntryImpl extends X509CRLEntry
e.hasMoreElements();) {
ex = e.nextElement();
inCertOID = ex.getExtensionId();
- if (inCertOID.equals((Object)findOID)) {
+ if (inCertOID.equals(findOID)) {
crlExt = ex;
break;
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
index 7a68cebdabb..ff62de87e63 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
@@ -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
@@ -1039,7 +1039,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
e.hasMoreElements();) {
ex = e.nextElement();
inCertOID = ex.getExtensionId();
- if (inCertOID.equals((Object)findOID)) {
+ if (inCertOID.equals(findOID)) {
crlExt = ex;
break;
}
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
index b74de5a5dfe..955f7793a86 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -1339,7 +1339,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
return ex;
}
for (Extension ex2: extensions.getAllExtensions()) {
- if (ex2.getExtensionId().equals((Object)oid)) {
+ if (ex2.getExtensionId().equals(oid)) {
//XXXX May want to consider cloning this
return ex2;
}
@@ -1395,7 +1395,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
for (Extension ex : exts.getAllExtensions()) {
ObjectIdentifier inCertOID = ex.getExtensionId();
- if (inCertOID.equals((Object)findOID)) {
+ if (inCertOID.equals(findOID)) {
certExt = ex;
break;
}
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
index f3ee71aa969..3fcd67466b7 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
@@ -1850,7 +1850,7 @@ public class UnicodeSet implements UnicodeMatcher {
syntaxError(chars, "Invalid property pattern");
}
chars.jumpahead(pos.getIndex());
- rebuiltPat.append(patStr.substring(0, pos.getIndex()));
+ rebuiltPat.append(patStr, 0, pos.getIndex());
}
//----------------------------------------------------------------
diff --git a/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java b/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java
index adb4163fe8e..7c4a843239d 100644
--- a/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java
+++ b/jdk/src/java.base/share/classes/sun/util/BuddhistCalendar.java
@@ -242,12 +242,13 @@ public class BuddhistCalendar extends GregorianCalendar {
return s;
}
p += yearField.length();
- StringBuilder sb = new StringBuilder(s.substring(0, p));
+ StringBuilder sb = new StringBuilder(s.length() + 10);
+ sb.append(s, 0, p);
// Skip the year number
while (Character.isDigit(s.charAt(p++)))
;
int year = internalGet(YEAR) + BUDDHIST_YEAR_OFFSET;
- sb.append(year).append(s.substring(p - 1));
+ sb.append(year).append(s, p - 1, s.length());
return sb.toString();
}
diff --git a/jdk/src/java.base/share/native/libjli/java.c b/jdk/src/java.base/share/native/libjli/java.c
index fa4c1c9ca99..64deecadec4 100644
--- a/jdk/src/java.base/share/native/libjli/java.c
+++ b/jdk/src/java.base/share/native/libjli/java.c
@@ -145,7 +145,7 @@ static struct vmdesc *knownVMs = NULL;
static int knownVMsCount = 0;
static int knownVMsLimit = 0;
-static void GrowKnownVMs();
+static void GrowKnownVMs(int minimum);
static int KnownVMIndex(const char* name);
static void FreeKnownVMs();
static jboolean IsWildCardEnabled();
diff --git a/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java b/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java
index fb0fef63646..c0ca02dd4ad 100644
--- a/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java
+++ b/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java
@@ -65,8 +65,8 @@ class UnixFileSystem extends FileSystem {
int n = len;
while ((n > 0) && (pathname.charAt(n - 1) == '/')) n--;
if (n == 0) return "/";
- StringBuffer sb = new StringBuffer(pathname.length());
- if (off > 0) sb.append(pathname.substring(0, off));
+ StringBuilder sb = new StringBuilder(pathname.length());
+ if (off > 0) sb.append(pathname, 0, off);
char prevChar = 0;
for (int i = off; i < n; i++) {
char c = pathname.charAt(i);
diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
index b742b3f626f..20e077cbdc3 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -83,18 +83,6 @@ class MimeTypesFileTypeDetector extends AbstractFileTypeDetector {
return mimeType;
}
- // Get the extension of a file name.
- private static String getExtension(String name) {
- String ext = "";
- if (name != null && !name.isEmpty()) {
- int dot = name.indexOf('.');
- if ((dot >= 0) && (dot < name.length() - 1)) {
- ext = name.substring(dot + 1);
- }
- }
- return ext;
- }
-
/**
* Parse the mime types file, and store the type-extension mappings into
* mimeTypeMap. The mime types file is not loaded until the first probe
diff --git a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index caa47f80c08..9ee66bf4169 100644
--- a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -104,7 +104,7 @@ class WinNTFileSystem extends FileSystem {
if (off < 3) off = 0; /* Avoid fencepost cases with UNC pathnames */
int src;
char slash = this.slash;
- StringBuffer sb = new StringBuffer(len);
+ StringBuilder sb = new StringBuilder(len);
if (off == 0) {
/* Complete normalization, including prefix */
@@ -112,7 +112,7 @@ class WinNTFileSystem extends FileSystem {
} else {
/* Partial normalization */
src = off;
- sb.append(path.substring(0, off));
+ sb.append(path, 0, off);
}
/* Remove redundant slashes from the remainder of the path, forcing all
@@ -156,8 +156,7 @@ class WinNTFileSystem extends FileSystem {
}
}
- String rv = sb.toString();
- return rv;
+ return sb.toString();
}
/* A normal Win32 pathname contains no duplicate slashes, except possibly
@@ -172,7 +171,7 @@ class WinNTFileSystem extends FileSystem {
else directory-relative (has form "z:foo")
3 absolute local pathname (begins with "z:\\")
*/
- private int normalizePrefix(String path, int len, StringBuffer sb) {
+ private int normalizePrefix(String path, int len, StringBuilder sb) {
int src = 0;
while ((src < len) && isSlash(path.charAt(src))) src++;
char c;
diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
index eeed61d3798..115002b5825 100644
--- a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
+++ b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
@@ -275,7 +275,7 @@ public final class JRSUIControl {
}
- Hit getHitForPoint(final double x, final double y, final double w, final double h, final double hitX, final double hitY) {
+ Hit getHitForPoint(final int x, final int y, final int w, final int h, final int hitX, final int hitY) {
sync();
// reflect hitY about the midline of the control before sending to native
final Hit hit = JRSUIConstants.getHit(getNativeHitPart(cfDictionaryPtr, priorEncodedProperties, currentEncodedProperties, x, y, w, h, hitX, 2 * y + h - hitY));
@@ -283,7 +283,7 @@ public final class JRSUIControl {
return hit;
}
- void getPartBounds(final double[] rect, final double x, final double y, final double w, final double h, final int part) {
+ void getPartBounds(final double[] rect, final int x, final int y, final int w, final int h, final int part) {
if (rect == null) throw new NullPointerException("Cannot load null rect");
if (rect.length != 4) throw new IllegalArgumentException("Rect must have four elements");
@@ -292,7 +292,7 @@ public final class JRSUIControl {
priorEncodedProperties = currentEncodedProperties;
}
- double getScrollBarOffsetChange(final double x, final double y, final double w, final double h, final int offset, final int visibleAmount, final int extent) {
+ double getScrollBarOffsetChange(final int x, final int y, final int w, final int h, final int offset, final int visibleAmount, final int extent) {
sync();
final double offsetChange = getNativeScrollBarOffsetChange(cfDictionaryPtr, priorEncodedProperties, currentEncodedProperties, x, y, w, h, offset, visibleAmount, extent);
priorEncodedProperties = currentEncodedProperties;
diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
index 94ef685714e..69fdf688013 100644
--- a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
+++ b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,14 +25,15 @@
package apple.laf;
-import com.apple.laf.AquaImageFactory.NineSliceMetrics;
-
-import apple.laf.JRSUIConstants.*;
-import sun.security.action.GetPropertyAction;
-
import java.security.AccessController;
-public class JRSUIUtils {
+import apple.laf.JRSUIConstants.Hit;
+import apple.laf.JRSUIConstants.ScrollBarPart;
+import com.apple.laf.AquaImageFactory.NineSliceMetrics;
+import sun.security.action.GetPropertyAction;
+
+public final class JRSUIUtils {
+
static boolean isLeopard = isMacOSXLeopard();
static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow();
@@ -48,7 +49,9 @@ public class JRSUIUtils {
return currentMacOSXVersionMatchesGivenVersionRange(version, true, false, false);
}
- static boolean currentMacOSXVersionMatchesGivenVersionRange(final int version, final boolean inclusive, final boolean matchBelow, final boolean matchAbove) {
+ static boolean currentMacOSXVersionMatchesGivenVersionRange(
+ final int version, final boolean inclusive,
+ final boolean matchBelow, final boolean matchAbove) {
// split the "10.x.y" version number
String osVersion = AccessController.doPrivileged(new GetPropertyAction("os.version"));
String[] fragments = osVersion.split("\\.");
@@ -99,12 +102,22 @@ public class JRSUIUtils {
return shouldUseScrollToClick();
}
- public static void getPartBounds(final double[] rect, final JRSUIControl control, final double x, final double y, final double w, final double h, final ScrollBarPart part) {
+ public static void getPartBounds(final double[] rect,
+ final JRSUIControl control,
+ final int x, final int y, final int w,
+ final int h,
+ final ScrollBarPart part) {
control.getPartBounds(rect, x, y, w, h, part.ordinal);
}
- public static double getNativeOffsetChange(final JRSUIControl control, final double x, final double y, final double w, final double h, final int offset, final int visibleAmount, final int extent) {
- return control.getScrollBarOffsetChange(x, y, w, h, offset, visibleAmount, extent);
+ public static double getNativeOffsetChange(final JRSUIControl control,
+ final int x, final int y,
+ final int w, final int h,
+ final int offset,
+ final int visibleAmount,
+ final int extent) {
+ return control.getScrollBarOffsetChange(x, y, w, h, offset,
+ visibleAmount, extent);
}
}
@@ -115,7 +128,10 @@ public class JRSUIUtils {
}
public static class HitDetection {
- public static Hit getHitForPoint(final JRSUIControl control, final double x, final double y, final double w, final double h, final double hitX, final double hitY) {
+ public static Hit getHitForPoint(final JRSUIControl control,
+ final int x, final int y, final int w,
+ final int h, final int hitX,
+ final int hitY) {
return control.getHitForPoint(x, y, w, h, hitX, hitY);
}
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Cursor.java b/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
index 5c7cce45230..3e6d9410476 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Cursor.java
@@ -26,8 +26,8 @@ package java.awt;
import java.beans.ConstructorProperties;
import java.io.InputStream;
-import java.net.URL;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.util.Hashtable;
import java.util.Properties;
@@ -261,7 +261,7 @@ public class Cursor implements java.io.Serializable {
* @throws IllegalArgumentException if the specified cursor type is
* invalid
*/
- static public Cursor getPredefinedCursor(int type) {
+ public static Cursor getPredefinedCursor(int type) {
if (type < Cursor.DEFAULT_CURSOR || type > Cursor.MOVE_CURSOR) {
throw new IllegalArgumentException("illegal cursor type");
}
@@ -286,7 +286,7 @@ public class Cursor implements java.io.Serializable {
* GraphicsEnvironment.isHeadless returns true
* @exception AWTException in case of erroneous retrieving of the cursor
*/
- static public Cursor getSystemCustomCursor(final String name)
+ public static Cursor getSystemCustomCursor(final String name)
throws AWTException, HeadlessException {
GraphicsEnvironment.checkHeadless();
Cursor cursor = systemCustomCursors.get(name);
@@ -330,18 +330,15 @@ public class Cursor implements java.io.Serializable {
} catch (NumberFormatException nfe) {
throw new AWTException("failed to parse hotspot property for cursor: " + name);
}
-
- try {
- final Toolkit toolkit = Toolkit.getDefaultToolkit();
- final String file = RESOURCE_PREFIX + fileName;
-
- cursor = AccessController.doPrivileged(
- (PrivilegedExceptionAction) () -> {
- URL url = Cursor.class.getResource(file);
- Image image = toolkit.getImage(url);
- return toolkit.createCustomCursor(image, hotPoint,
- localized);
- });
+ final Toolkit toolkit = Toolkit.getDefaultToolkit();
+ final String file = RESOURCE_PREFIX + fileName;
+ final InputStream in = AccessController.doPrivileged(
+ (PrivilegedAction) () -> {
+ return Cursor.class.getResourceAsStream(file);
+ });
+ try (in) {
+ Image image = toolkit.createImage(in.readAllBytes());
+ cursor = toolkit.createCustomCursor(image, hotPoint, localized);
} catch (Exception e) {
throw new AWTException(
"Exception: " + e.getClass() + " " + e.getMessage() +
@@ -365,7 +362,7 @@ public class Cursor implements java.io.Serializable {
*
* @return the default cursor
*/
- static public Cursor getDefaultCursor() {
+ public static Cursor getDefaultCursor() {
return getPredefinedCursor(Cursor.DEFAULT_CURSOR);
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
index 31107cbc637..e48d28eacf8 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -58,6 +58,14 @@ import sun.awt.PeerEvent;
import sun.awt.SunToolkit;
import sun.util.CoreResourceBundleControl;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.accessibility.AccessibilityProvider;
+
/**
* This class is the abstract superclass of all actual
* implementations of the Abstract Window Toolkit. Subclasses of
@@ -420,7 +428,7 @@ public abstract class Toolkit {
}
}
- // Get the names of any assistive technolgies to load. First
+ // Get the names of any assistive technologies to load. First
// check the system property and then check the properties
// file.
String classNames = System.getProperty("javax.accessibility.assistive_technologies");
@@ -436,85 +444,125 @@ public abstract class Toolkit {
}
/**
- * Loads additional classes into the VM, using the property
- * 'assistive_technologies' specified in the Sun reference
- * implementation by a line in the 'accessibility.properties'
- * file. The form is "assistive_technologies=..." where
- * the "..." is a comma-separated list of assistive technology
- * classes to load. Each class is loaded in the order given
- * and a single instance of each is created using
- * Class.forName(class).newInstance(). All errors are handled
- * via an AWTError exception.
+ * Rethrow the AWTError but include the cause.
*
- * The assumption is made that assistive technology classes are supplied
- * as part of INSTALLED (as opposed to: BUNDLED) extensions or specified
- * on the class path
- * (and therefore can be loaded using the class loader returned by
- * a call to ClassLoader.getSystemClassLoader, whose
- * delegation parent is the extension class loader for installed
- * extensions).
+ * @param s the error message
+ * @param e the original exception
+ * @throw the new AWTError including the cause (the original exception)
+ */
+ private static void newAWTError(Throwable e, String s) {
+ AWTError newAWTError = new AWTError(s);
+ newAWTError.initCause(e);
+ throw newAWTError;
+ }
+
+ /**
+ * When a service provider for Assistive Technology is not found look for a
+ * supporting class on the class path and instantiate it.
+ *
+ * @param atName the name of the class to be loaded
+ */
+ private static void fallbackToLoadClassForAT(String atName) {
+ try {
+ Class.forName(atName, false, ClassLoader.getSystemClassLoader()).newInstance();
+ } catch (ClassNotFoundException e) {
+ newAWTError(e, "Assistive Technology not found: " + atName);
+ } catch (InstantiationException e) {
+ newAWTError(e, "Could not instantiate Assistive Technology: " + atName);
+ } catch (IllegalAccessException e) {
+ newAWTError(e, "Could not access Assistive Technology: " + atName);
+ } catch (Exception e) {
+ newAWTError(e, "Error trying to install Assistive Technology: " + atName);
+ }
+ }
+
+ /**
+ * Loads accessibility support using the property assistive_technologies.
+ * The form is assistive_technologies= followed by a comma-separated list of
+ * assistive technology providers to load. The order in which providers are
+ * loaded is determined by the order in which the ServiceLoader discovers
+ * implementations of the AccessibilityProvider interface, not by the order
+ * of provider names in the property list. When a provider is found its
+ * accessibility implementation will be started by calling the provider's
+ * activate method. All errors are handled via an AWTError exception.
*/
private static void loadAssistiveTechnologies() {
// Load any assistive technologies
if (atNames != null) {
ClassLoader cl = ClassLoader.getSystemClassLoader();
- StringTokenizer parser = new StringTokenizer(atNames," ,");
- String atName;
- while (parser.hasMoreTokens()) {
- atName = parser.nextToken();
+ Set names = Arrays.stream(atNames.split(","))
+ .map(String::trim)
+ .collect(Collectors.toSet());
+ final Map providers = new HashMap<>();
+ AccessController.doPrivileged((PrivilegedAction) () -> {
try {
- Class clazz;
- if (cl != null) {
- clazz = cl.loadClass(atName);
- } else {
- clazz = Class.forName(atName);
+ for (AccessibilityProvider p : ServiceLoader.load(AccessibilityProvider.class, cl)) {
+ String name = p.getName();
+ if (names.contains(name) && !providers.containsKey(name)) {
+ p.activate();
+ providers.put(name, p);
+ }
}
- clazz.newInstance();
- } catch (ClassNotFoundException e) {
- throw new AWTError("Assistive Technology not found: "
- + atName);
- } catch (InstantiationException e) {
- throw new AWTError("Could not instantiate Assistive"
- + " Technology: " + atName);
- } catch (IllegalAccessException e) {
- throw new AWTError("Could not access Assistive"
- + " Technology: " + atName);
- } catch (Exception e) {
- throw new AWTError("Error trying to install Assistive"
- + " Technology: " + atName + " " + e);
+ } catch (java.util.ServiceConfigurationError | Exception e) {
+ newAWTError(e, "Could not load or activate service provider");
}
- }
+ return null;
+ });
+ names.stream()
+ .filter(n -> !providers.containsKey(n))
+ .forEach(Toolkit::fallbackToLoadClassForAT);
}
}
/**
* Gets the default toolkit.
*
- * If a system property named "java.awt.headless" is set
- * to true then the headless implementation
- * of Toolkit is used.
+ * If a system property named {@code "java.awt.headless"} is set
+ * to {@code true} then the headless implementation
+ * of {@code Toolkit} is used.
*
- * If there is no "java.awt.headless" or it is set to
- * false and there is a system property named
- * "awt.toolkit",
+ * If there is no {@code "java.awt.headless"} or it is set to
+ * {@code false} and there is a system property named
+ * {@code "awt.toolkit"},
* that property is treated as the name of a class that is a subclass
- * of Toolkit;
+ * of {@code Toolkit};
* otherwise the default platform-specific implementation of
- * Toolkit is used.
+ * {@code Toolkit} is used.
*
- * Also loads additional classes into the VM, using the property
- * 'assistive_technologies' specified in the Sun reference
- * implementation by a line in the 'accessibility.properties'
- * file. The form is "assistive_technologies=..." where
- * the "..." is a comma-separated list of assistive technology
- * classes to load. Each class is loaded in the order given
- * and a single instance of each is created using
- * Class.forName(class).newInstance(). This is done just after
- * the AWT toolkit is created. All errors are handled via an
- * AWTError exception.
- * @return the default toolkit.
+ * If this Toolkit is not a headless implementation and if they exist, service
+ * providers of {@link javax.accessibility.AccessibilityProvider} will be loaded
+ * if specified by the system property
+ * {@code javax.accessibility.assistive_technologies}.
+ *
+ * An example of setting this property is to invoke Java with
+ * {@code -Djavax.accessibility.assistive_technologies=MyServiceProvider}.
+ * In addition to MyServiceProvider other service providers can be specified
+ * using a comma separated list. Service providers are loaded after the AWT
+ * toolkit is created. All errors are handled via an AWTError exception.
+ *
+ * The names specified in the assistive_technologies property are used to query
+ * each service provider implementation. If the requested name matches the
+ * {@linkplain AccessibilityProvider#getName name} of the service provider, the
+ * {@link AccessibilityProvider#activate} method will be invoked to activate the
+ * matching service provider.
+ *
+ * @implSpec
+ * If assistive technology service providers are not specified with a system
+ * property this implementation will look in a properties file located as follows:
+ *
+ * {@code ${user.home}/.accessibility.properties}
+ * {@code ${java.home}/conf/accessibility.properties}
+ *
+ * Only the first of these files to be located will be consulted. The requested
+ * service providers are specified by setting the {@code assistive_technologies=}
+ * property. A single provider or a comma separated list of providers can be
+ * specified.
+ *
+ * @return the default toolkit.
* @exception AWTError if a toolkit could not be found, or
* if one could not be accessed or instantiated.
+ * @see java.util.ServiceLoader
+ * @see javax.accessibility.AccessibilityProvider
*/
public static synchronized Toolkit getDefaultToolkit() {
if (toolkit == null) {
@@ -550,7 +598,9 @@ public abstract class Toolkit {
return null;
}
});
- loadAssistiveTechnologies();
+ if (!GraphicsEnvironment.isHeadless()) {
+ loadAssistiveTechnologies();
+ }
}
return toolkit;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java
new file mode 100644
index 00000000000..001b42f15d6
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/javax/accessibility/AccessibilityProvider.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+package javax.accessibility;
+
+/**
+ * Service Provider Interface (SPI) for Assistive Technology.
+ *
+ * This service provider class provides mappings from the platform
+ * specific accessibility APIs to the Java Accessibility API.
+ *
+ * Each service provider implementation is named and can be activated via the
+ * {@link #activate} method. Service providers can be loaded when the default
+ * {@link java.awt.Toolkit toolkit} is initialized.
+ *
+ * @apiNote There will typically be one provider per platform, such as Windows
+ * or Linux, to support accessibility for screen readers and magnifiers. However,
+ * more than one service provider can be activated. For example, a test tool
+ * which provides visual results obtained by interrogating the Java Accessibility
+ * API can be activated along with the activation of the support for screen readers
+ * and screen magnifiers.
+ *
+ * @see java.awt.Toolkit#getDefaultToolkit
+ * @see java.util.ServiceLoader
+ * @since 1.9
+ */
+public abstract class AccessibilityProvider {
+
+ /**
+ * Initializes a new accessibility provider.
+ *
+ * @throws SecurityException
+ * If a security manager has been installed and it denies
+ * {@link RuntimePermission} {@code "accessibilityProvider"}
+ */
+ protected AccessibilityProvider() {
+ // Use a permission check when calling a private constructor to check that
+ // the proper security permission has been granted before the Object superclass
+ // is called. If an exception is thrown before the Object superclass is
+ // constructed a finalizer in a subclass of this class will not be run.
+ // This protects against a finalizer vulnerability.
+ this(checkPermission());
+ }
+
+ private AccessibilityProvider(Void ignore) { }
+
+ /**
+ * If this code is running with a security manager and if the permission
+ * "accessibilityProvider" has not been granted SecurityException will be thrown.
+ *
+ */
+ private static Void checkPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new RuntimePermission("accessibilityProvider"));
+ return null;
+ }
+
+ /**
+ * Returns the name of this service provider. This name is used to locate a
+ * requested service provider.
+ *
+ * @return the name of this service provider
+ */
+ public abstract String getName();
+
+ /**
+ * Activates the support provided by this service provider.
+ */
+ public abstract void activate();
+
+}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
index 76451154127..f22fd8e86dd 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -896,11 +896,12 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI {
// Paint the background for the tab area
if ( tabPane.isOpaque() ) {
- if (!c.isBackgroundSet() && (tabAreaBackground != null)) {
+ Color background = c.getBackground();
+ if (background instanceof UIResource && tabAreaBackground != null) {
g.setColor(tabAreaBackground);
}
else {
- g.setColor( c.getBackground() );
+ g.setColor(background);
}
switch ( tabPlacement ) {
case LEFT:
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 80b58f37e1c..847c0884b6a 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -291,7 +291,7 @@ public abstract class SunToolkit extends Toolkit
// Maps from non-Component/MenuComponent to AppContext.
// WeakHashMap
private static final Map appContextMap =
- Collections.synchronizedMap(new WeakHashMap());
+ Collections.synchronizedMap(new WeakIdentityHashMap());
/**
* Sets the appContext field of target. If target is not a Component or
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java b/jdk/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java
new file mode 100644
index 00000000000..5a2f44109bf
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/sun/awt/WeakIdentityHashMap.java
@@ -0,0 +1,195 @@
+package sun.awt;
+
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.*;
+
+// A weak key reference hash map that uses System.identityHashCode() and "=="
+// instead of hashCode() and equals(Object)
+class WeakIdentityHashMap implements Map {
+ private final Map, V> map;
+ private final transient ReferenceQueue queue = new ReferenceQueue();
+
+ /**
+ * Constructs a new, empty identity hash map with a default initial
+ * size (16).
+ */
+ public WeakIdentityHashMap() {
+ map = new HashMap<>(16);
+ }
+
+ /**
+ * Constructs a new, empty identity map with the specified initial size.
+ */
+ public WeakIdentityHashMap(int initialSize) {
+ map = new HashMap<>(initialSize);
+ }
+
+ private Map, V> getMap() {
+ for(Reference ref; (ref = this.queue.poll()) != null;) {
+ map.remove(ref);
+ }
+ return map;
+ }
+
+ @Override
+ public int size() {
+ return getMap().size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return getMap().isEmpty();
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ return getMap().containsKey(new WeakKey<>(key, null));
+ }
+
+ @Override
+ public boolean containsValue(Object value) {
+ return getMap().containsValue(value);
+ }
+
+ @Override
+ public V get(Object key) {
+ return getMap().get(new WeakKey<>(key, null));
+ }
+
+ @Override
+ public V put(K key, V value) {
+ return getMap().put(new WeakKey(key, queue), value);
+ }
+
+ @Override
+ public V remove(Object key) {
+ return getMap().remove(new WeakKey<>(key, null));
+ }
+
+ @Override
+ public void putAll(Map m) {
+ for (Entry entry : m.entrySet()) {
+ put(entry.getKey(), entry.getValue());
+ }
+ }
+
+ @Override
+ public void clear() {
+ getMap().clear();
+ }
+
+ @Override
+ public Set keySet() {
+ return new AbstractSet() {
+ @Override
+ public Iterator iterator() {
+ return new Iterator() {
+ private K next;
+ Iterator> iterator = getMap().keySet().iterator();
+
+ @Override
+ public boolean hasNext() {
+ while (iterator.hasNext()) {
+ if ((next = iterator.next().get()) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public K next() {
+ if(next == null && !hasNext()) {
+ throw new NoSuchElementException();
+ }
+ K ret = next;
+ next = null;
+ return ret;
+ }
+ };
+ }
+
+ @Override
+ public int size() {
+ return getMap().keySet().size();
+ }
+ };
+ }
+
+ @Override
+ public Collection values() {
+ return getMap().values();
+ }
+
+ @Override
+ public Set> entrySet() {
+ return new AbstractSet>() {
+ @Override
+ public Iterator> iterator() {
+ final Iterator, V>> iterator = getMap().entrySet().iterator();
+ return new Iterator>() {
+ @Override
+ public boolean hasNext() {
+ return iterator.hasNext();
+ }
+
+ @Override
+ public Entry next() {
+ return new Entry() {
+ Entry, V> entry = iterator.next();
+
+ @Override
+ public K getKey() {
+ return entry.getKey().get();
+ }
+
+ @Override
+ public V getValue() {
+ return entry.getValue();
+ }
+
+ @Override
+ public V setValue(V value) {
+ return null;
+ }
+ };
+ }
+ };
+ }
+
+ @Override
+ public int size() {
+ return getMap().entrySet().size();
+ }
+ };
+ }
+
+ private static class WeakKey extends WeakReference {
+ private final int hash;
+
+ WeakKey(K key, ReferenceQueue q) {
+ super(key, q);
+ hash = System.identityHashCode(key);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if(this == o) {
+ return true;
+ } else if( o instanceof WeakKey ) {
+ return get() == ((WeakKey)o).get();
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return hash;
+ }
+ }
+
+
+}
diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
index 0629e9d6da1..5d30f26eb18 100644
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
+++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/LookupProcessor.cpp
@@ -175,7 +175,7 @@ LookupProcessor::LookupProcessor(const LETableReference &baseAddress,
LEReferenceTo langSysTable;
le_uint16 featureCount = 0;
le_uint16 lookupListCount = 0;
- le_uint16 requiredFeatureIndex;
+ le_uint16 requiredFeatureIndex = 0xFFFF;
if (LE_FAILURE(success)) {
return;
diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsopt.c b/jdk/src/java.desktop/share/native/liblcms/cmsopt.c
index c3267ecf1bd..892ec0a4040 100644
--- a/jdk/src/java.desktop/share/native/liblcms/cmsopt.c
+++ b/jdk/src/java.desktop/share/native/liblcms/cmsopt.c
@@ -260,7 +260,9 @@ cmsBool _MultiplyMatrix(cmsPipeline* Lut)
cmsStage* Multmat = cmsStageAllocMatrix(Lut->ContextID, 3, 3, (const cmsFloat64Number*) &res, NULL);
// Recover the chain
- Multmat->Next = chain;
+ if (Multmat != NULL) {
+ Multmat->Next = chain;
+ }
*pt1 = Multmat;
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index 32b2d8bccaf..3f95f42611a 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -2466,7 +2466,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
private static XEventDispatcher oops_waiter;
private static boolean oops_updated;
- private static boolean oops_move;
+ private static int oops_position = 0;
/**
* @inheritDoc
@@ -2495,9 +2495,12 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
oops_updated = false;
long event_number = getEventNumber();
// Generate OOPS ConfigureNotify event
- XlibWrapper.XMoveWindow(getDisplay(), win.getWindow(), oops_move ? 0 : 1, 0);
+ XlibWrapper.XMoveWindow(getDisplay(), win.getWindow(), ++oops_position, 0);
// Change win position each time to avoid system optimization
- oops_move = !oops_move;
+ if (oops_position > 50) {
+ oops_position = 0;
+ }
+
XSync();
eventLog.finer("Generated OOPS ConfigureNotify event");
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
index bb645e1a3a0..9539b981709 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
@@ -29,6 +29,7 @@ import java.awt.Image;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
@@ -233,6 +234,7 @@ final class Win32ShellFolder2 extends ShellFolder {
private Image smallIcon = null;
private Image largeIcon = null;
private Boolean isDir = null;
+ private final boolean isLib;
/*
* The following is to identify the My Documents folder as being special
@@ -254,6 +256,7 @@ final class Win32ShellFolder2 extends ShellFolder {
// Desktop is parent of DRIVES and NETWORK, not necessarily
// other special shell folders.
super(null, composePathForCsidl(csidl));
+ isLib = false;
invoke(new Callable() {
public Void call() throws InterruptedException {
@@ -279,7 +282,7 @@ final class Win32ShellFolder2 extends ShellFolder {
// Now we know that parent isn't immediate to 'this' because it
// has a continued ID list. Create a shell folder for this child
// pidl and make it the new 'parent'.
- parent = new Win32ShellFolder2((Win32ShellFolder2) parent, childPIDL);
+ parent = createShellFolder((Win32ShellFolder2) parent, childPIDL);
} else {
// No grandchildren means we have arrived at the parent of 'this',
// and childPIDL is directly relative to parent.
@@ -301,8 +304,9 @@ final class Win32ShellFolder2 extends ShellFolder {
/**
* Create a system shell folder
*/
- Win32ShellFolder2(Win32ShellFolder2 parent, long pIShellFolder, long relativePIDL, String path) {
+ Win32ShellFolder2(Win32ShellFolder2 parent, long pIShellFolder, long relativePIDL, String path, boolean isLib) {
super(parent, (path != null) ? path : "ShellFolder: ");
+ this.isLib = isLib;
this.disposer.pIShellFolder = pIShellFolder;
this.disposer.relativePIDL = relativePIDL;
sun.java2d.Disposer.addRecord(this, disposer);
@@ -312,16 +316,19 @@ final class Win32ShellFolder2 extends ShellFolder {
/**
* Creates a shell folder with a parent and relative PIDL
*/
- Win32ShellFolder2(final Win32ShellFolder2 parent, final long relativePIDL) throws InterruptedException {
- super(parent,
- invoke(new Callable() {
- public String call() {
- return getFileSystemPath(parent.getIShellFolder(), relativePIDL);
- }
- }, RuntimeException.class)
- );
- this.disposer.relativePIDL = relativePIDL;
- sun.java2d.Disposer.addRecord(this, disposer);
+ static Win32ShellFolder2 createShellFolder(Win32ShellFolder2 parent, long pIDL)
+ throws InterruptedException {
+ String path = invoke(new Callable() {
+ public String call() {
+ return getFileSystemPath(parent.getIShellFolder(), pIDL);
+ }
+ }, RuntimeException.class);
+ String libPath = resolveLibrary(path);
+ if (libPath == null) {
+ return new Win32ShellFolder2(parent, 0, pIDL, path, false);
+ } else {
+ return new Win32ShellFolder2(parent, 0, pIDL, libPath, true);
+ }
}
// Initializes the desktop shell folder
@@ -601,20 +608,24 @@ final class Win32ShellFolder2 extends ShellFolder {
}
String path = getDisplayNameOf(parentIShellFolder, relativePIDL,
SHGDN_FORPARSING);
+ return path;
+ }
+
+ private static String resolveLibrary(String path) {
// if this is a library its default save location is taken as a path
// this is a temp fix until java.io starts support Libraries
if( path != null && path.startsWith("::{") &&
path.toLowerCase().endsWith(".library-ms")) {
for (KnownFolderDefinition kf : KnownFolderDefinition.libraries) {
- if( path.toLowerCase().endsWith(
- kf.relativePath.toLowerCase()) &&
- path.toUpperCase().startsWith(
- kf.parsingName.substring(0, 40).toUpperCase()) ) {
+ if (path.toLowerCase().endsWith(
+ "\\" + kf.relativePath.toLowerCase()) &&
+ path.toUpperCase().startsWith(
+ kf.parsingName.substring(0, 40).toUpperCase())) {
return kf.saveLocation;
}
}
}
- return path;
+ return null;
}
// Needs to be accessible to Win32ShellFolderManager2
@@ -750,7 +761,7 @@ final class Win32ShellFolder2 extends ShellFolder {
&& pidlsEqual(pIShellFolder, childPIDL, personal.disposer.relativePIDL)) {
childFolder = personal;
} else {
- childFolder = new Win32ShellFolder2(Win32ShellFolder2.this, childPIDL);
+ childFolder = createShellFolder(Win32ShellFolder2.this, childPIDL);
releasePIDL = false;
}
list.add(childFolder);
@@ -790,10 +801,11 @@ final class Win32ShellFolder2 extends ShellFolder {
while ((childPIDL = getNextChild(pEnumObjects)) != 0) {
if (getAttributes0(pIShellFolder, childPIDL, ATTRIB_FILESYSTEM) != 0) {
String path = getFileSystemPath(pIShellFolder, childPIDL);
+ if(isLib) path = resolveLibrary( path );
if (path != null && path.equalsIgnoreCase(filePath)) {
long childIShellFolder = bindToObject(pIShellFolder, childPIDL);
child = new Win32ShellFolder2(Win32ShellFolder2.this,
- childIShellFolder, childPIDL, path);
+ childIShellFolder, childPIDL, path, isLib);
break;
}
}
@@ -839,14 +851,14 @@ final class Win32ShellFolder2 extends ShellFolder {
return getLinkLocation(true);
}
- private ShellFolder getLinkLocation(final boolean resolve) {
- return invoke(new Callable() {
- public ShellFolder call() {
+ private Win32ShellFolder2 getLinkLocation(final boolean resolve) {
+ return invoke(new Callable() {
+ public Win32ShellFolder2 call() {
if (!isLink()) {
return null;
}
- ShellFolder location = null;
+ Win32ShellFolder2 location = null;
long linkLocationPIDL = getLinkLocation(getParentIShellFolder(),
getRelativePIDL(), resolve);
if (linkLocationPIDL != 0) {
@@ -956,7 +968,7 @@ final class Win32ShellFolder2 extends ShellFolder {
// NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
private static native long extractIcon(long parentIShellFolder, long relativePIDL,
- boolean getLargeIcon);
+ boolean getLargeIcon, boolean getDefaultIcon);
// Returns an icon from the Windows system icon list in the form of an HICON
private static native long getSystemIcon(int iconID);
@@ -1007,7 +1019,13 @@ final class Win32ShellFolder2 extends ShellFolder {
invoke(new Callable() {
public Image call() {
Image newIcon = null;
- if (isFileSystem()) {
+ if (isLink()) {
+ Win32ShellFolder2 folder = getLinkLocation(false);
+ if (folder != null && folder.isLibrary()) {
+ return folder.getIcon(getLargeIcon);
+ }
+ }
+ if (isFileSystem() || isLibrary()) {
long parentIShellIcon = (parent != null)
? ((Win32ShellFolder2) parent).getIShellIcon()
: 0L;
@@ -1037,7 +1055,19 @@ final class Win32ShellFolder2 extends ShellFolder {
if (newIcon == null) {
// These are only cached per object
long hIcon = extractIcon(getParentIShellFolder(),
- getRelativePIDL(), getLargeIcon);
+ getRelativePIDL(), getLargeIcon, false);
+ // E_PENDING: loading can take time so get the default
+ if(hIcon <= 0) {
+ hIcon = extractIcon(getParentIShellFolder(),
+ getRelativePIDL(), getLargeIcon, true);
+ if(hIcon <= 0) {
+ if (isDirectory()) {
+ return getShell32Icon(4, getLargeIcon);
+ } else {
+ return getShell32Icon(1, getLargeIcon);
+ }
+ }
+ }
newIcon = makeIcon(hIcon, getLargeIcon);
disposeIcon(hIcon);
}
@@ -1129,6 +1159,8 @@ final class Win32ShellFolder2 extends ShellFolder {
private static final int LVCFMT_CENTER = 2;
public ShellFolderColumnInfo[] getFolderColumns() {
+ ShellFolder library = resolveLibrary();
+ if (library != null) return library.getFolderColumns();
return invoke(new Callable() {
public ShellFolderColumnInfo[] call() {
ShellFolderColumnInfo[] columns = doGetColumnInfo(getIShellFolder());
@@ -1159,6 +1191,10 @@ final class Win32ShellFolder2 extends ShellFolder {
}
public Object getFolderColumnValue(final int column) {
+ if(!isLibrary()) {
+ ShellFolder library = resolveLibrary();
+ if (library != null) return library.getFolderColumnValue(column);
+ }
return invoke(new Callable() {
public Object call() {
return doGetColumnValue(getParentIShellFolder(), getRelativePIDL(), column);
@@ -1166,6 +1202,26 @@ final class Win32ShellFolder2 extends ShellFolder {
});
}
+ boolean isLibrary() {
+ return isLib;
+ }
+
+ private ShellFolder resolveLibrary() {
+ for (ShellFolder f = this; f != null; f = f.parent) {
+ if (!f.isFileSystem()) {
+ if (f instanceof Win32ShellFolder2 &&
+ ((Win32ShellFolder2)f).isLibrary()) {
+ try {
+ return getShellFolder(new File(getPath()));
+ } catch (FileNotFoundException e) {
+ }
+ }
+ break;
+ }
+ }
+ return null;
+ }
+
// NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
private native ShellFolderColumnInfo[] doGetColumnInfo(long iShellFolder2);
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
index 52d198f034c..4817e2a62bc 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -94,7 +94,7 @@ final class Win32ShellFolderManager2 extends ShellFolderManager {
while (pIDL != 0) {
long curPIDL = Win32ShellFolder2.copyFirstPIDLEntry(pIDL);
if (curPIDL != 0) {
- parent = new Win32ShellFolder2(parent, curPIDL);
+ parent = Win32ShellFolder2.createShellFolder(parent, curPIDL);
pIDL = Win32ShellFolder2.getNextPIDLEntry(pIDL);
} else {
// The list is empty if the parent is Desktop and pIDL is a shortcut to Desktop
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
index 0f5a0e8d942..b70048a9122 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
@@ -868,10 +868,11 @@ JNIEXPORT jint JNICALL Java_sun_awt_shell_Win32ShellFolder2_getIconIndex
/*
* Class: sun_awt_shell_Win32ShellFolder2
* Method: extractIcon
- * Signature: (JJZ)J
+ * Signature: (JJZZ)J
*/
JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_extractIcon
- (JNIEnv* env, jclass cls, jlong pIShellFolderL, jlong relativePIDL, jboolean getLargeIcon)
+ (JNIEnv* env, jclass cls, jlong pIShellFolderL, jlong relativePIDL,
+ jboolean getLargeIcon, jboolean getDefaultIcon)
{
IShellFolder* pIShellFolder = (IShellFolder*)pIShellFolderL;
LPITEMIDLIST pidl = (LPITEMIDLIST)relativePIDL;
@@ -889,7 +890,8 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_extractIcon
WCHAR szBuf[MAX_PATH];
INT index;
UINT flags;
- hres = pIcon->GetIconLocation(GIL_FORSHELL, szBuf, MAX_PATH, &index, &flags);
+ UINT uFlags = getDefaultIcon ? GIL_DEFAULTICON : GIL_FORSHELL | GIL_ASYNC;
+ hres = pIcon->GetIconLocation(uFlags, szBuf, MAX_PATH, &index, &flags);
if (SUCCEEDED(hres)) {
HICON hIconLarge;
hres = pIcon->Extract(szBuf, index, &hIconLarge, &hIcon, (16 << 16) + 32);
@@ -901,6 +903,9 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_extractIcon
fn_DestroyIcon((HICON)hIconLarge);
}
}
+ } else if (hres == E_PENDING) {
+ pIcon->Release();
+ return E_PENDING;
}
pIcon->Release();
}
@@ -1284,7 +1289,6 @@ JNIEXPORT jint JNICALL
JNIEXPORT jobjectArray JNICALL Java_sun_awt_shell_Win32ShellFolder2_loadKnownFolders
(JNIEnv* env, jclass cls )
{
- CoInitialize(NULL);
IKnownFolderManager* pkfm = NULL;
HRESULT hr = CoCreateInstance(CLSID_KnownFolderManager, NULL,
CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pkfm));
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc b/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc
index d02ad3e4bfe..bae34cfbdcb 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1997, 2004, 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
@@ -31,7 +31,6 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-HAND_CURSOR CURSOR DISCARDABLE "hand.cur"
AWT_ICON ICON DISCARDABLE "awt.ico"
CHECK_BITMAP BITMAP DISCARDABLE "check.bmp"
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp
index 3cdf9d8d642..3d116ecad08 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp
@@ -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
@@ -144,7 +144,7 @@ AwtCursor * AwtCursor::CreateSystemCursor(jobject jCursor)
winCursor = IDC_SIZEWE;
break;
case java_awt_Cursor_HAND_CURSOR:
- winCursor = TEXT("HAND_CURSOR");
+ winCursor = IDC_HAND;
break;
case java_awt_Cursor_MOVE_CURSOR:
winCursor = IDC_SIZEALL;
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/hand.cur b/jdk/src/java.desktop/windows/native/libawt/windows/hand.cur
deleted file mode 100644
index bb7156bac4f..00000000000
Binary files a/jdk/src/java.desktop/windows/native/libawt/windows/hand.cur and /dev/null differ
diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java
index 5a82dde4058..25a255faa2e 100644
--- a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java
+++ b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/Oid.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -157,7 +157,7 @@ public class Oid {
return (true);
if (other instanceof Oid)
- return this.oid.equals((Object)((Oid) other).oid);
+ return this.oid.equals(((Oid) other).oid);
else if (other instanceof ObjectIdentifier)
return this.oid.equals(other);
else
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
index d1e09de1b77..1f9fe9d337f 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/GSSContextImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -252,7 +252,7 @@ public class GSSContextImpl implements GSSContext {
} else {
// parse GSS header
gssHeader = new GSSHeader(inStream);
- if (!gssHeader.getOid().equals((Object) objId))
+ if (!gssHeader.getOid().equals(objId))
throw new GSSExceptionImpl
(GSSException.DEFECTIVE_TOKEN,
"Mechanism not equal to " +
@@ -346,7 +346,7 @@ public class GSSContextImpl implements GSSContext {
} else {
// parse GSS Header
gssHeader = new GSSHeader(inStream);
- if (!gssHeader.getOid().equals((Object) objId))
+ if (!gssHeader.getOid().equals(objId))
throw new GSSExceptionImpl
(GSSException.DEFECTIVE_TOKEN,
"Mechanism not equal to " +
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java
index 6d344d31aad..9e2a781549a 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/MessageToken.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -182,7 +182,7 @@ abstract class MessageToken extends Krb5Token {
try {
gssHeader = new GSSHeader(is);
- if (!gssHeader.getOid().equals((Object)OID)) {
+ if (!gssHeader.getOid().equals(OID)) {
throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1,
getTokenName(tokenId));
}
diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java
index d5d5d43bfc2..7f74c4c869b 100644
--- a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java
+++ b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -25,11 +25,17 @@
package java.sql;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.ServiceLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Stream;
+
import sun.reflect.CallerSensitive;
import sun.reflect.Reflection;
@@ -429,29 +435,44 @@ public class DriverManager {
* d.getClass().getName()
*
* @return the list of JDBC Drivers loaded by the caller's class loader
+ * @see #drivers()
*/
@CallerSensitive
- public static java.util.Enumeration getDrivers() {
- java.util.Vector result = new java.util.Vector<>();
-
+ public static Enumeration getDrivers() {
ensureDriversInitialized();
- Class callerClass = Reflection.getCallerClass();
+ return Collections.enumeration(getDrivers(Reflection.getCallerClass()));
+ }
+ /**
+ * Retrieves a Stream with all of the currently loaded JDBC drivers
+ * to which the current caller has access.
+ *
+ * @return the stream of JDBC Drivers loaded by the caller's class loader
+ * @since 1.9
+ */
+ @CallerSensitive
+ public static Stream drivers() {
+ ensureDriversInitialized();
+
+ return getDrivers(Reflection.getCallerClass()).stream();
+ }
+
+ private static List getDrivers(Class callerClass) {
+ List result = new ArrayList<>();
// Walk through the loaded registeredDrivers.
for (DriverInfo aDriver : registeredDrivers) {
// If the caller does not have permission to load the driver then
// skip it.
if (isDriverAllowed(aDriver.driver, callerClass)) {
- result.addElement(aDriver.driver);
+ result.add(aDriver.driver);
} else {
println(" skipping: " + aDriver.getClass().getName());
}
}
- return (result.elements());
+ return result;
}
-
/**
* Sets the maximum time in seconds that a driver will wait
* while attempting to connect to a database once the driver has
diff --git a/jdk/src/jdk.accessibility/windows/classes/META-INF/services/javax.accessibility.AccessibilityProvider b/jdk/src/jdk.accessibility/windows/classes/META-INF/services/javax.accessibility.AccessibilityProvider
new file mode 100644
index 00000000000..f3b2bcb9a56
--- /dev/null
+++ b/jdk/src/jdk.accessibility/windows/classes/META-INF/services/javax.accessibility.AccessibilityProvider
@@ -0,0 +1,26 @@
+# 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.
+
+
+com.sun.java.accessibility.ProviderImpl
+
diff --git a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/ProviderImpl.java b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/ProviderImpl.java
new file mode 100644
index 00000000000..925ade115ec
--- /dev/null
+++ b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/ProviderImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package com.sun.java.accessibility;
+
+import javax.accessibility.AccessibilityProvider;
+
+/* This class provided methods to identify and activate the mapping from the
+ * JavaAccessBridge API to the Java Accessibility API.
+ */
+public final class ProviderImpl extends AccessibilityProvider {
+ /**
+ * Typically the service name returned by the name() method would be a simple
+ * name such as JavaAccessBridge, but the following name is used for compatibility
+ * with prior versions of ${user.home}/.accessibility.properties and
+ * ${java.home}/conf/accessibility.properties where the text on the
+ * assistive.technologies= line is a fully qualified class name. As of Java 9
+ * class names are no longer used to identify assistive technology implementations.
+ * If the properties file exists the installer will not replace it thus the
+ * need for compatibility.
+ */
+ private final String name = "com.sun.java.accessibility.AccessBridge";
+
+ public ProviderImpl() {}
+
+ public String getName() {
+ return name;
+ }
+
+ public void activate() {
+ /**
+ * Note that the AccessBridge is instantiated here rather than in the
+ * constructor. If the caller determines that this object is named
+ * "com.sun.java.accessibility.AccessBridge" then the caller will call
+ * start to instantiate the AccessBridge which will in turn activate it.
+ */
+ new AccessBridge();
+ }
+
+}
diff --git a/jdk/src/jdk.accessibility/windows/conf/accessibility.properties b/jdk/src/jdk.accessibility/windows/conf/accessibility.properties
deleted file mode 100644
index 7217be09feb..00000000000
--- a/jdk/src/jdk.accessibility/windows/conf/accessibility.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Load the Java Access Bridge class into the JVM
-#
-#assistive_technologies=com.sun.java.accessibility.AccessBridge
-#screen_magnifier_present=true
-
diff --git a/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
index 83613e8c15b..161c2aed088 100644
--- a/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
+++ b/jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@@ -30,6 +30,7 @@
#include
#include
+#include
#include
#include
#include
@@ -58,11 +59,16 @@ void ThrowException(JNIEnv *env, char *exceptionName, DWORD dwError)
char szMessage[1024];
szMessage[0] = '\0';
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, NULL, szMessage,
- 1024, NULL);
+ DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError,
+ NULL, szMessage, sizeof(szMessage), NULL);
+ if (res == 0) {
+ strcpy(szMessage, "Unknown error");
+ }
jclass exceptionClazz = env->FindClass(exceptionName);
- env->ThrowNew(exceptionClazz, szMessage);
+ if (exceptionClazz != NULL) {
+ env->ThrowNew(exceptionClazz, szMessage);
+ }
}
@@ -295,22 +301,42 @@ JNIEXPORT void JNICALL Java_sun_security_mscapi_KeyStore_loadKeysOrCertificateCh
// Determine clazz and method ID to generate certificate
jclass clazzArrayList = env->FindClass("java/util/ArrayList");
+ if (clazzArrayList == NULL) {
+ __leave;
+ }
jmethodID mNewArrayList = env->GetMethodID(clazzArrayList, "", "()V");
+ if (mNewArrayList == NULL) {
+ __leave;
+ }
- jmethodID mGenCert = env->GetMethodID(env->GetObjectClass(obj),
+ jclass clazzOfThis = env->GetObjectClass(obj);
+ if (clazzOfThis == NULL) {
+ __leave;
+ }
+
+ jmethodID mGenCert = env->GetMethodID(clazzOfThis,
"generateCertificate",
"([BLjava/util/Collection;)V");
+ if (mGenCert == NULL) {
+ __leave;
+ }
// Determine method ID to generate certificate chain
- jmethodID mGenCertChain = env->GetMethodID(env->GetObjectClass(obj),
+ jmethodID mGenCertChain = env->GetMethodID(clazzOfThis,
"generateCertificateChain",
"(Ljava/lang/String;Ljava/util/Collection;Ljava/util/Collection;)V");
+ if (mGenCertChain == NULL) {
+ __leave;
+ }
// Determine method ID to generate RSA certificate chain
- jmethodID mGenRSAKeyAndCertChain = env->GetMethodID(env->GetObjectClass(obj),
+ jmethodID mGenRSAKeyAndCertChain = env->GetMethodID(clazzOfThis,
"generateRSAKeyAndCertificateChain",
"(Ljava/lang/String;JJILjava/util/Collection;Ljava/util/Collection;)V");
+ if (mGenRSAKeyAndCertChain == NULL) {
+ __leave;
+ }
// Use CertEnumCertificatesInStore to get the certificates
// from the open store. pCertContext must be reset to
@@ -590,9 +616,6 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSASignature_signHash
}
__finally
{
- if (hCryptProvAlt)
- ::CryptReleaseContext(hCryptProvAlt, 0);
-
if (pSignedHashBuffer)
delete [] pSignedHashBuffer;
@@ -601,6 +624,9 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSASignature_signHash
if (hHash)
::CryptDestroyHash(hHash);
+
+ if (hCryptProvAlt)
+ ::CryptReleaseContext(hCryptProvAlt, 0);
}
return jSignedHash;
@@ -688,9 +714,6 @@ JNIEXPORT jboolean JNICALL Java_sun_security_mscapi_RSASignature_verifySignedHas
__finally
{
- if (hCryptProvAlt)
- ::CryptReleaseContext(hCryptProvAlt, 0);
-
if (pSignedHashBuffer)
delete [] pSignedHashBuffer;
@@ -699,6 +722,9 @@ JNIEXPORT jboolean JNICALL Java_sun_security_mscapi_RSASignature_verifySignedHas
if (hHash)
::CryptDestroyHash(hHash);
+
+ if (hCryptProvAlt)
+ ::CryptReleaseContext(hCryptProvAlt, 0);
}
return result;
@@ -763,9 +789,15 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_RSAKeyPairGenerator_generateR
// Get the method ID for the RSAKeyPair constructor
jclass clazzRSAKeyPair =
env->FindClass("sun/security/mscapi/RSAKeyPair");
+ if (clazzRSAKeyPair == NULL) {
+ __leave;
+ }
jmethodID mNewRSAKeyPair =
env->GetMethodID(clazzRSAKeyPair, "", "(JJI)V");
+ if (mNewRSAKeyPair == NULL) {
+ __leave;
+ }
// Create a new RSA keypair
keypair = env->NewObject(clazzRSAKeyPair, mNewRSAKeyPair,
@@ -1948,9 +1980,15 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_KeyStore_storePrivateKey
// Get the method ID for the RSAPrivateKey constructor
jclass clazzRSAPrivateKey =
env->FindClass("sun/security/mscapi/RSAPrivateKey");
+ if (clazzRSAPrivateKey == NULL) {
+ __leave;
+ }
jmethodID mNewRSAPrivateKey =
env->GetMethodID(clazzRSAPrivateKey, "", "(JJI)V");
+ if (mNewRSAPrivateKey == NULL) {
+ __leave;
+ }
// Create a new RSA private key
privateKey = env->NewObject(clazzRSAPrivateKey, mNewRSAPrivateKey,
@@ -2035,9 +2073,15 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_RSASignature_importPublicKey
// Get the method ID for the RSAPublicKey constructor
jclass clazzRSAPublicKey =
env->FindClass("sun/security/mscapi/RSAPublicKey");
+ if (clazzRSAPublicKey == NULL) {
+ __leave;
+ }
jmethodID mNewRSAPublicKey =
env->GetMethodID(clazzRSAPublicKey, "", "(JJI)V");
+ if (mNewRSAPublicKey == NULL) {
+ __leave;
+ }
// Create a new RSA public key
publicKey = env->NewObject(clazzRSAPublicKey, mNewRSAPublicKey,
diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
index 938897b8789..3f440fe7a28 100644
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
+++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
@@ -169,7 +169,7 @@ public final class TimestampedSigner extends ContentSigner {
for (int i = 0; i < derValue.length; i++) {
description = new AccessDescription(derValue[i]);
if (description.getAccessMethod()
- .equals((Object)AD_TIMESTAMPING_Id)) {
+ .equals(AD_TIMESTAMPING_Id)) {
location = description.getAccessLocation();
if (location.getType() == GeneralNameInterface.NAME_URI) {
uri = (URIName) location.getName();
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index bed59bc7d24..22078493fab 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -116,6 +116,12 @@
# jdk_beans
+# 8060027
+java/beans/XMLEncoder/Test4903007.java generic-all
+java/beans/XMLEncoder/java_awt_GridBagLayout.java generic-all
+java/beans/XMLDecoder/8028054/TestConstructorFinder.java generic-all
+java/beans/XMLDecoder/8028054/TestMethodFinder.java generic-all
+
############################################################################
# jdk_lang
@@ -221,9 +227,6 @@ sun/security/pkcs11/ec/TestKeyFactory.java generic-all
# 7164518: no PortUnreachableException on Mac
sun/security/krb5/auto/Unreachable.java macosx-all
-# 8058849
-sun/security/krb5/config/dns.sh generic-all
-
# 7041639: Solaris DSA keypair generation bug
java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all
sun/security/tools/keytool/standard.sh solaris-all
@@ -292,10 +295,16 @@ sun/security/pkcs11/tls/TestMasterSecret.java windows-all
sun/security/pkcs11/tls/TestPRF.java windows-all
sun/security/pkcs11/tls/TestPremaster.java windows-all
+# 8051770
+sun/security/provider/SecureRandom/StrongSecureRandom.java macosx-10.10
+
############################################################################
# jdk_sound
+# 8059743
+javax/sound/midi/Gervill/SoftProvider/GetDevice.java generic-all
+
############################################################################
# jdk_swing
diff --git a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java b/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
index 079426f9ce2..cc4f155e57c 100644
--- a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
+++ b/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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 @@
* @bug 8007267
* @summary [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
* @author leonid.romanov@oracle.com
+ * @modules java.desktop/sun.awt
* @run main DefaultMenuBarTest
*/
diff --git a/jdk/test/com/apple/eawt/TEST.properties b/jdk/test/com/apple/eawt/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/com/apple/eawt/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
index bf4cdc5bb3a..01d4eaca7cd 100644
--- a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
+++ b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -27,6 +27,8 @@
@summary The size returned by SecurityWarning.getSize() should not be zero
@author anthony.petrov@sun.com: area=awt.toplevel
@library ../../../../java/awt/regtesthelpers
+ @modules java.desktop/com.sun.awt
+ java.desktop/sun.awt
@build Util CustomSecurityManager CopyClassFile
@run main CopyClassFile CustomSecurityManager bootcp/
@run main/othervm/secure=CustomSecurityManager -Xbootclasspath/a:bootcp GetSizeShouldNotReturnZero
diff --git a/jdk/test/com/sun/awt/TEST.properties b/jdk/test/com/sun/awt/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/com/sun/awt/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
index a8391503238..1f1454b12ff 100644
--- a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
+++ b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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 @@
@bug 6594131
@summary Tests the AWTUtilities.get/setWindowOpacity() methods
@author anthony.petrov@...: area=awt.toplevel
+ @modules java.desktop/com.sun.awt
@run main WindowOpacity
*/
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java
index 4cd9a00066c..ef538f63f90 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -34,7 +34,6 @@ import java.security.spec.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.security.Provider;
-import com.sun.crypto.provider.*;
public class Test4511676 {
private static final String ALGO = "AES";
@@ -59,7 +58,6 @@ public class Test4511676 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
Test4511676 test = new Test4511676();
String testName = test.getClass().getName() + "[" + ALGO +
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java
index 6b751e751b3..b743d6bcefd 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -35,7 +35,6 @@ import java.util.Random;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.security.Provider;
-import com.sun.crypto.provider.*;
public class Test4512524 {
@@ -65,8 +64,6 @@ public class Test4512524 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4512524 test = new Test4512524();
test.execute("CBC");
test.execute("GCM");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java
index ad89561493d..bf004314392 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -35,7 +35,6 @@ import java.util.Random;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.security.Provider;
-import com.sun.crypto.provider.*;
public class Test4512704 {
private static final String ALGO = "AES";
@@ -61,8 +60,6 @@ public class Test4512704 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4512704 test = new Test4512704();
test.execute("CBC");
test.execute("GCM");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java
index c421b169c4a..a3bfc0012ff 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -85,8 +85,6 @@ public class Test4513830 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4513830 test = new Test4513830();
String testName = test.getClass().getName() + "[" + ALGO +
"/" + MODE + "/" + PADDING + "]";
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java
index 7ea6b8316f8..ccab72bf69a 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -37,7 +37,6 @@ import java.util.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.security.Provider;
-import com.sun.crypto.provider.*;
public class Test4517355 {
@@ -93,8 +92,6 @@ public class Test4517355 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4517355 test = new Test4517355();
Random rdm = new Random();
rdm.nextBytes(test.plainText);
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java
index dc32cc4a657..86409d3e4cd 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -60,8 +60,6 @@ public class Test4626070 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4626070 test = new Test4626070();
test.execute("CBC", "PKCS5Padding");
test.execute("GCM", "NoPadding");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java
index 8d05806dc5f..dbd97239be8 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015, Red Hat, Inc.
+ * Copyright (c) 2015, Oracle, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +25,14 @@
/*
* @test
* @bug 8069072
- * @summary Test vectors for com.sun.crypto.provider.GHASH
+ * @summary Test vectors for com.sun.crypto.provider.GHASH.
+ *
+ * Single iteration to verify software-only GHASH algorithm.
+ * @run main TestGHASH
+ *
+ * Multi-iteration to verify test intrinsics GHASH, if available.
+ * Many iterations are needed so we are sure hotspot will use intrinsic
+ * @run main TestGHASH -n 10000
*/
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -124,43 +132,55 @@ public class TestGHASH {
public static void main(String[] args) throws Exception {
TestGHASH test;
- if (args.length == 0) {
- test = new TestGHASH("com.sun.crypto.provider.GHASH");
- } else {
- test = new TestGHASH(args[0]);
+ String test_class = "com.sun.crypto.provider.GHASH";
+ int i = 0;
+ int num_of_loops = 1;
+ while (args.length > i) {
+ if (args[i].compareTo("-c") == 0) {
+ test_class = args[++i];
+ } else if (args[i].compareTo("-n") == 0) {
+ num_of_loops = Integer.parseInt(args[++i]);
+ }
+ i++;
}
- // Test vectors from David A. McGrew, John Viega,
- // "The Galois/Counter Mode of Operation (GCM)", 2005.
- //
+ System.out.println("Running " + num_of_loops + " iterations.");
+ test = new TestGHASH(test_class);
+ i = 0;
- test.check(1, "66e94bd4ef8a2c3b884cfa59ca342b2e", "", "",
- "00000000000000000000000000000000");
- test.check(2,
- "66e94bd4ef8a2c3b884cfa59ca342b2e", "",
- "0388dace60b6a392f328c2b971b2fe78",
- "f38cbb1ad69223dcc3457ae5b6b0f885");
- test.check(3,
- "b83b533708bf535d0aa6e52980d53b78", "",
- "42831ec2217774244b7221b784d0d49c" +
- "e3aa212f2c02a4e035c17e2329aca12e" +
- "21d514b25466931c7d8f6a5aac84aa05" +
- "1ba30b396a0aac973d58e091473f5985",
- "7f1b32b81b820d02614f8895ac1d4eac");
- test.check(4,
- "b83b533708bf535d0aa6e52980d53b78",
- "feedfacedeadbeeffeedfacedeadbeef" + "abaddad2",
- "42831ec2217774244b7221b784d0d49c" +
- "e3aa212f2c02a4e035c17e2329aca12e" +
- "21d514b25466931c7d8f6a5aac84aa05" +
- "1ba30b396a0aac973d58e091",
- "698e57f70e6ecc7fd9463b7260a9ae5f");
- test.check(5, "b83b533708bf535d0aa6e52980d53b78",
- "feedfacedeadbeeffeedfacedeadbeef" + "abaddad2",
- "61353b4c2806934a777ff51fa22a4755" +
- "699b2a714fcdc6f83766e5f97b6c7423" +
- "73806900e49f24b22b097544d4896b42" +
- "4989b5e1ebac0f07c23f4598",
- "df586bb4c249b92cb6922877e444d37b");
+ while (num_of_loops > i) {
+ // Test vectors from David A. McGrew, John Viega,
+ // "The Galois/Counter Mode of Operation (GCM)", 2005.
+ //
+ test.check(1, "66e94bd4ef8a2c3b884cfa59ca342b2e", "", "",
+ "00000000000000000000000000000000");
+ test.check(2,
+ "66e94bd4ef8a2c3b884cfa59ca342b2e", "",
+ "0388dace60b6a392f328c2b971b2fe78",
+ "f38cbb1ad69223dcc3457ae5b6b0f885");
+ test.check(3,
+ "b83b533708bf535d0aa6e52980d53b78", "",
+ "42831ec2217774244b7221b784d0d49c" +
+ "e3aa212f2c02a4e035c17e2329aca12e" +
+ "21d514b25466931c7d8f6a5aac84aa05" +
+ "1ba30b396a0aac973d58e091473f5985",
+ "7f1b32b81b820d02614f8895ac1d4eac");
+ test.check(4,
+ "b83b533708bf535d0aa6e52980d53b78",
+ "feedfacedeadbeeffeedfacedeadbeef" + "abaddad2",
+ "42831ec2217774244b7221b784d0d49c" +
+ "e3aa212f2c02a4e035c17e2329aca12e" +
+ "21d514b25466931c7d8f6a5aac84aa05" +
+ "1ba30b396a0aac973d58e091",
+ "698e57f70e6ecc7fd9463b7260a9ae5f");
+ test.check(5, "b83b533708bf535d0aa6e52980d53b78",
+ "feedfacedeadbeeffeedfacedeadbeef" + "abaddad2",
+ "61353b4c2806934a777ff51fa22a4755" +
+ "699b2a714fcdc6f83766e5f97b6c7423" +
+ "73806900e49f24b22b097544d4896b42" +
+ "4989b5e1ebac0f07c23f4598",
+ "df586bb4c249b92cb6922877e444d37b");
+ i++;
+ }
}
}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java
index e14a3a85187..7cdd845cd5b 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -118,8 +118,6 @@ public class TestKATForECB_IV
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
TestKATForECB_IV test = new TestKATForECB_IV();
String testName = test.getClass().getName() + "[" + ALGO +
"/" + MODE + "/" + PADDING + "]";
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java
index e07abe087c3..098232b8c4c 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -34,7 +34,6 @@ import java.security.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.math.*;
-import com.sun.crypto.provider.*;
import java.util.*;
@@ -746,8 +745,6 @@ public class TestKATForECB_VK
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
TestKATForECB_VK test = new TestKATForECB_VK();
String testName = test.getClass().getName() + "[" + ALGO +
"/" + MODE + "/" + PADDING + "]";
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java
index 78391e68c8f..b8f83bd7b05 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -34,7 +34,6 @@ import java.security.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import java.math.*;
-import com.sun.crypto.provider.*;
import java.util.*;
@@ -555,8 +554,6 @@ public class TestKATForECB_VT
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
TestKATForECB_VT test = new TestKATForECB_VT();
String testName = test.getClass().getName() + "[" + ALGO +
"/" + MODE + "/" + PADDING + "]";
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java b/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
index 400489265d5..20d460f3c65 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -68,10 +68,8 @@ public class BlowfishTestVector {
public static void main(String[] argv) throws Exception {
- Provider p = new com.sun.crypto.provider.SunJCE();
- Security.addProvider(p);
String transformation = "Blowfish/ECB/NoPadding";
- Cipher cipher = Cipher.getInstance(transformation);
+ Cipher cipher = Cipher.getInstance(transformation, "SunJCE");
int MAX_KEY_SIZE = Cipher.getMaxAllowedKeyLength(transformation);
//
// test 1
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java
index e5ec14f18e5..34a2af6ac73 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -46,11 +46,11 @@ public class DESSecretKeySpec {
System.out.println("Testing DES key");
SecretKeySpec skey = new SecretKeySpec(key, "DES");
c = Cipher.getInstance("DES/CBC/PKCS5Padding", "SunJCE");
- SecretKeyFactory.getInstance("DES").generateSecret(skey);
+ SecretKeyFactory.getInstance("DES", "SunJCE").generateSecret(skey);
System.out.println("Testing DESede key");
skey = new SecretKeySpec(key, "DESede");
c = Cipher.getInstance("DESede/CBC/PKCS5Padding", "SunJCE");
- SecretKeyFactory.getInstance("TripleDES").generateSecret(skey);
+ SecretKeyFactory.getInstance("TripleDES", "SunJCE").generateSecret(skey);
}
}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java
index 59de8de4ad4..7d327e5ee4c 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, 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
@@ -32,7 +32,6 @@ import java.security.*;
import java.security.spec.*;
import javax.crypto.*;
import javax.crypto.spec.*;
-import com.sun.crypto.provider.*;
public class DesAPITest {
@@ -87,9 +86,6 @@ public class DesAPITest {
public void init(String crypt, String mode, String padding)
throws Exception {
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
-
KeySpec desKeySpec = null;
SecretKeyFactory factory = null;
@@ -99,7 +95,7 @@ public class DesAPITest {
if (padding.length() != 0)
cipherName.append("/" + padding);
- cipher = Cipher.getInstance(cipherName.toString());
+ cipher = Cipher.getInstance(cipherName.toString(), "SunJCE");
if (crypt.endsWith("ede")) {
desKeySpec = new DESedeKeySpec(key3);
factory = SecretKeyFactory.getInstance("DESede", "SunJCE");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java
index f58217244b7..99293b31236 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -85,9 +85,7 @@ public class DoFinalReturnLen {
IvParameterSpec IvParamSpec = null;
SecretKey sKey = null;
- // Step 0: add providers
- Provider sun = new com.sun.crypto.provider.SunJCE();
- Security.addProvider(sun);
+ // Step 0: list providers
Provider[] theProviders = Security.getProviders();
for (int index = 0; index < theProviders.length; index++) {
System.out.println(theProviders[index].getName());
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java
index bb03a885825..5dd428cbdec 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -32,18 +32,13 @@ import java.io.*;
import java.security.*;
import javax.crypto.*;
import javax.crypto.spec.*;
-import com.sun.crypto.provider.SunJCE;
public class FlushBug {
public static void main(String[] args) throws Exception {
-
- Provider prov = new com.sun.crypto.provider.SunJCE();
- Security.addProvider(prov);
-
SecureRandom sr = new SecureRandom();
// Create new DES key.
- KeyGenerator kg = KeyGenerator.getInstance("DES");
+ KeyGenerator kg = KeyGenerator.getInstance("DES", "SunJCE");
kg.init(sr);
Key key = kg.generateKey();
@@ -53,13 +48,13 @@ public class FlushBug {
IvParameterSpec iv = new IvParameterSpec(iv_bytes);
// Create the consumer
- Cipher decrypter = Cipher.getInstance("DES/CFB8/NoPadding");
+ Cipher decrypter = Cipher.getInstance("DES/CFB8/NoPadding", "SunJCE");
decrypter.init(Cipher.DECRYPT_MODE, key, iv);
PipedInputStream consumer = new PipedInputStream();
InputStream in = new CipherInputStream(consumer, decrypter);
// Create the producer
- Cipher encrypter = Cipher.getInstance("DES/CFB8/NoPadding");
+ Cipher encrypter = Cipher.getInstance("DES/CFB8/NoPadding", "SunJCE");
encrypter.init(Cipher.ENCRYPT_MODE, key, iv);
PipedOutputStream producer = new PipedOutputStream();
OutputStream out = new CipherOutputStream(producer, encrypter);
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java
index eee4fc9ab72..889dc733166 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java
@@ -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
@@ -118,7 +118,7 @@ public class PaddingTest {
if (padding.length() != 0)
cipherName.append("/" + padding);
- cipher = Cipher.getInstance(cipherName.toString());
+ cipher = Cipher.getInstance(cipherName.toString(), "SunJCE");
if (crypt.endsWith("ede")) {
desKeySpec = new DESedeKeySpec(key3);
factory = SecretKeyFactory.getInstance("DESede", "SunJCE");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
index f235df6be2e..7e3d860d28a 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
@@ -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
@@ -152,7 +152,7 @@ public class PerformanceTest {
if (padding.length() != 0)
cipherName.append("/" + padding);
- cipher = Cipher.getInstance(cipherName.toString());
+ cipher = Cipher.getInstance(cipherName.toString(), "SunJCE");
if (crypt.endsWith("ede")) {
desKeySpec = new DESedeKeySpec(key3);
factory = SecretKeyFactory.getInstance("DESede", "SunJCE");
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java
index 5c949c8b019..abc536f14e2 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -35,19 +35,17 @@ public class Sealtest {
public static void main(String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
// create DSA keypair
KeyPairGenerator kpgen = KeyPairGenerator.getInstance("DSA");
kpgen.initialize(512);
KeyPair kp = kpgen.generateKeyPair();
// create DES key
- KeyGenerator kg = KeyGenerator.getInstance("DES");
+ KeyGenerator kg = KeyGenerator.getInstance("DES", "SunJCE");
SecretKey skey = kg.generateKey();
// create cipher
- Cipher c = Cipher.getInstance("DES/CFB16/PKCS5Padding");
+ Cipher c = Cipher.getInstance("DES/CFB16/PKCS5Padding", "SunJCE");
c.init(Cipher.ENCRYPT_MODE, skey);
// seal the DSA private key
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java b/jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java
index 66c5079032a..d9bf59b63f0 100644
--- a/jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java
+++ b/jdk/test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,6 +30,7 @@
*/
import java.security.Security;
+import java.security.Provider;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
@@ -40,13 +41,12 @@ public class SunJCEGetInstance {
try{
// Remove SunJCE from Provider list
+ Provider prov = Security.getProvider("SunJCE");
Security.removeProvider("SunJCE");
-
// Create our own instance of SunJCE provider. Purposefully not
// using SunJCE.getInstance() so we can have our own instance
// for the test.
- jce = Cipher.getInstance("AES/CBC/PKCS5Padding",
- new com.sun.crypto.provider.SunJCE());
+ jce = Cipher.getInstance("AES/CBC/PKCS5Padding", prov);
jce.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec("1234567890abcedf".getBytes(), "AES"));
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
index 53a922a788a..34e87030636 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, 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
@@ -32,7 +32,6 @@ import java.security.spec.*;
import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
-import com.sun.crypto.provider.*;
import java.math.BigInteger;
public class DHGenSharedSecret {
@@ -69,8 +68,6 @@ public class DHGenSharedSecret {
};
public static void main(String[] args) throws Exception {
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
DHGenSharedSecret test = new DHGenSharedSecret();
test.run();
}
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
index 292a8cb234c..8499f849ce5 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
@@ -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
@@ -25,6 +25,7 @@
* @test
* @bug 7146728
* @summary DHKeyAgreement2
+ * @modules java.base/sun.misc
* @author Jan Luehe
*/
@@ -36,7 +37,6 @@ import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import javax.crypto.interfaces.*;
-import com.sun.crypto.provider.SunJCE;
import sun.misc.HexDumpEncoder;
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
index 22dbabb62ad..8815d9bd5e3 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -36,7 +36,6 @@ import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import javax.crypto.interfaces.*;
-import com.sun.crypto.provider.SunJCE;
/**
* This test utility executes the Diffie-Hellman key agreement protocol
@@ -51,10 +50,6 @@ public class DHKeyAgreement3 {
private DHKeyAgreement3() {}
public static void main(String argv[]) throws Exception {
- // Add JCE to the list of providers
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
-
DHKeyAgreement3 keyAgree = new DHKeyAgreement3();
keyAgree.run();
System.out.println("Test Passed");
@@ -69,36 +64,36 @@ public class DHKeyAgreement3 {
// Alice creates her own DH key pair
System.err.println("ALICE: Generate DH keypair ...");
- KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
aliceKpairGen.initialize(dhSkipParamSpec);
KeyPair aliceKpair = aliceKpairGen.generateKeyPair();
// Bob creates his own DH key pair
System.err.println("BOB: Generate DH keypair ...");
- KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
bobKpairGen.initialize(dhSkipParamSpec);
KeyPair bobKpair = bobKpairGen.generateKeyPair();
// Carol creates her own DH key pair
System.err.println("CAROL: Generate DH keypair ...");
- KeyPairGenerator carolKpairGen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator carolKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
carolKpairGen.initialize(dhSkipParamSpec);
KeyPair carolKpair = carolKpairGen.generateKeyPair();
// Alice initialize
System.err.println("ALICE: Initialize ...");
- KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH");
+ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
aliceKeyAgree.init(aliceKpair.getPrivate());
// Bob initialize
System.err.println("BOB: Initialize ...");
- KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH");
+ KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
bobKeyAgree.init(bobKpair.getPrivate());
// Carol initialize
System.err.println("CAROL: Initialize ...");
- KeyAgreement carolKeyAgree = KeyAgreement.getInstance("DH");
+ KeyAgreement carolKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
carolKeyAgree.init(carolKpair.getPrivate());
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java
index 0ab5164406f..e12f3871ec2 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -36,7 +36,6 @@ import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import javax.crypto.interfaces.*;
-import com.sun.crypto.provider.SunJCE;
/**
* This test creates a DH keypair, retrieves the encodings of the DH public and
@@ -49,10 +48,6 @@ public class DHKeyFactory {
private DHKeyFactory() {}
public static void main(String argv[]) throws Exception {
- // Add JCE to the list of providers
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
-
DHKeyFactory test = new DHKeyFactory();
test.run();
System.out.println("Test Passed");
@@ -67,7 +62,7 @@ public class DHKeyFactory {
dhSkipParamSpec = new DHParameterSpec(skip1024Modulus,
skip1024Base);
- KeyPairGenerator kpgen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator kpgen = KeyPairGenerator.getInstance("DH", "SunJCE");
kpgen.initialize(dhSkipParamSpec);
KeyPair kp = kpgen.generateKeyPair();
@@ -77,7 +72,7 @@ public class DHKeyFactory {
// get the private key encoding
byte[] privKeyEnc = kp.getPrivate().getEncoded();
- KeyFactory kfac = KeyFactory.getInstance("DH");
+ KeyFactory kfac = KeyFactory.getInstance("DH", "SunJCE");
X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKeyEnc);
PublicKey pubKey = kfac.generatePublic(x509KeySpec);
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java
index 5b7f8b932eb..b24f0a66fb9 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, 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
@@ -32,7 +32,6 @@ import java.security.spec.*;
import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
-import com.sun.crypto.provider.*;
import java.math.*;
public class DHKeyGenSpeed {
@@ -71,8 +70,6 @@ public class DHKeyGenSpeed {
};
public static void main(String[] args) throws Exception {
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
DHKeyGenSpeed test = new DHKeyGenSpeed();
test.run();
System.out.println("Test Passed");
diff --git a/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java b/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
index 83b2c690410..d7b3971676c 100644
--- a/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
+++ b/jdk/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
@@ -66,15 +66,17 @@ public class TestProviderLeak {
megaByte = new byte [MB];
data.add(megaByte);
} catch (OutOfMemoryError e) {
- System.out.println("OOME is thrown when allocating "
- + data.size() + "MB memory.");
- megaByte = null;
+ megaByte = null; // Free memory ASAP
+
+ int size = data.size();
for (int j = 0; j < RESERVATION && !data.isEmpty(); j++) {
data.removeLast();
}
System.gc();
hasException = true;
+ System.out.println("OOME is thrown when allocating "
+ + size + "MB memory.");
}
}
dumpMemoryStats("After memory allocation");
diff --git a/jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java b/jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java
index 227404e2510..3e93874a88a 100644
--- a/jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java
+++ b/jdk/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -78,8 +78,6 @@ public class Test4628062 {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
-
Test4628062 test = new Test4628062();
String testName = test.getClass().getName();
if (test.execute("AES", AES_SIZES)) {
diff --git a/jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java b/jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java
index e5101e41636..fd53497a4b4 100644
--- a/jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java
+++ b/jdk/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -52,7 +52,6 @@ public class TestExplicitKeyLength {
}
public static void main (String[] args) throws Exception {
- Security.addProvider(new com.sun.crypto.provider.SunJCE());
for (int i = 0; i < ALGOS.length; i++) {
System.out.println("Testing " + ALGOS[i] + " KeyGenerator with " +
KEY_SIZES[i] + "-bit keysize");
diff --git a/jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java b/jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java
index 43a98525b20..cc95b58d20f 100644
--- a/jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java
+++ b/jdk/test/com/sun/crypto/provider/Mac/HmacMD5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -39,9 +39,6 @@ public class HmacMD5 {
int i, j, n;
Mac mac;
- Provider jce = new com.sun.crypto.provider.SunJCE();
- Security.addProvider(jce);
-
byte[][][] test_data = {
{
{ (byte)0x0b, (byte)0x0b, (byte)0x0b, (byte)0x0b,
@@ -92,7 +89,7 @@ public class HmacMD5 {
}
};
- mac = Mac.getInstance("HmacMD5");
+ mac = Mac.getInstance("HmacMD5", "SunJCE");
for (i=0; i<3; i++) {
j=0;
@@ -109,7 +106,7 @@ public class HmacMD5 {
}
// now test multiple-part operation, using the 2nd test vector
- mac = Mac.getInstance("HmacMD5");
+ mac = Mac.getInstance("HmacMD5", "SunJCE");
mac.init(new SecretKeySpec("Jefe".getBytes(), "HMAC"));
mac.update("what do ya ".getBytes());
mac.update("want for ".getBytes());
diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java b/jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
index a45f65f0a0f..5d4bd5cc4d0 100644
--- a/jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,6 @@ import java.security.interfaces.*;
import javax.crypto.*;
import javax.crypto.spec.*;
import javax.crypto.interfaces.*;
-import com.sun.crypto.provider.SunJCE;
/**
* Test that leading zeroes are stripped in TlsPremasterSecret case,
@@ -52,10 +51,6 @@ public class TestLeadingZeroes {
private TestLeadingZeroes() {}
public static void main(String argv[]) throws Exception {
- // Add JCE to the list of providers
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
-
TestLeadingZeroes keyAgree = new TestLeadingZeroes();
keyAgree.run();
System.out.println("Test Passed");
diff --git a/jdk/test/com/sun/java/swing/TEST.properties b/jdk/test/com/sun/java/swing/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/com/sun/java/swing/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
index 890aa8ddbdf..74b2890c563 100644
--- a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
+++ b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
@bug 6824600
@summary OOM occurs when setLookAndFeel() is executed in Windows L&F(XP style)
@author Pavel Porvatov
+ @modules java.desktop/com.sun.java.swing.plaf.windows
@run main Test6824600
*/
diff --git a/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java b/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java
new file mode 100644
index 00000000000..fe07abd8f1c
--- /dev/null
+++ b/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8054386
+ * @summary java debugging test for CDS
+ * @modules jdk.jdi
+ * java.base/sun.misc
+ * java.management
+ * jdk.jartool/sun.tools.jar
+ * @library /lib/testlibrary
+ * @library ..
+ * @run compile -g ../BreakpointTest.java
+ * @run main CDSBreakpointTest
+ */
+
+/*
+ * Launch the JDI BreakpointTest, which will set a debugger breakpoint in
+ * BreakpointTarg. BreakpointTarg is first dumped into the CDS archive,
+ * so this will test debugging a class in the archive.
+ */
+
+public class CDSBreakpointTest extends CDSJDITest {
+ static String jarClasses[] = {
+ // BreakpointTarg is the only class we need in the archive. It will
+ // be launched by BreakpointTest as the debuggee application. Note,
+ // compiling BreakpointTest.java above will cause BreakpointTarg to
+ // be compiled since it is also in BreakpointTest.java.
+ "BreakpointTarg",
+ };
+ static String testname = "BreakpointTest";
+
+ public static void main(String[] args) throws Exception {
+ runTest(testname, jarClasses);
+ }
+}
diff --git a/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java b/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java
new file mode 100644
index 00000000000..1f03cacd681
--- /dev/null
+++ b/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8054386
+ * @summary java debugging test for CDS
+ * @modules jdk.jdi
+ * java.base/sun.misc
+ * java.management
+ * jdk.jartool/sun.tools.jar
+ * @library /lib/testlibrary
+ * @library ..
+ * @run compile -g ../DeleteAllBkptsTest.java
+ * @run main CDSDeleteAllBkptsTest
+ */
+
+/*
+ * Launch the JDI DeleteAllBkptsTest, which will set a debugger breakpoint in
+ * DeleteAllBkptsTarg and then clear them. DeleteAllBkptsTarg is first dumped
+ * into the CDS archive, so this will test debugging a class in the archive.
+ */
+
+public class CDSDeleteAllBkptsTest extends CDSJDITest {
+ static String jarClasses[] = {
+ // DeleteAllBkptsTarg is the only class we need in the archive. It will
+ // be launched by DeleteAllBkptsTest as the debuggee application. Note,
+ // compiling DeleteAllBkptsTest.java above will cause DeleteAllBkptsTarg to
+ // be compiled since it is also in DeleteAllBkptsTest.java.
+ "DeleteAllBkptsTarg",
+ };
+ static String testname = "DeleteAllBkptsTest";
+
+ public static void main(String[] args) throws Exception {
+ runTest(testname, jarClasses);
+ }
+}
diff --git a/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java b/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java
new file mode 100644
index 00000000000..dcb4145d3ae
--- /dev/null
+++ b/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8054386
+ * @summary java debugging test for CDS
+ * @modules jdk.jdi
+ * java.base/sun.misc
+ * java.management
+ * jdk.jartool/sun.tools.jar
+ * @library /lib/testlibrary
+ * @library ..
+ * @run compile -g ../FieldWatchpoints.java
+ * @run main CDSFieldWatchpoints
+ */
+
+/*
+ * Launch the JDI FieldWatchpoints test, which will setup field watchpoints in
+ * FieldWatchpointsDebugee. FieldWatchpointsDebugee is first dumped into the
+ * CDS archive, so this will test debugging a class in the archive.
+ */
+
+public class CDSFieldWatchpoints extends CDSJDITest {
+ static String jarClasses[] = {
+ // FieldWatchpointsDebugee. A, and B are the only classes we need in the archive.
+ // FieldWatchpointsDebugee will be launched by FieldWatchpoints as the debuggee
+ // application. Note, compiling FieldWatchpoints.java above will cause
+ // FieldWatchpointsDebugee to be compiled since it is also in FieldWatchpoints.java.
+ "FieldWatchpointsDebugee", "A", "B",
+ };
+ static String testname = "FieldWatchpoints";
+
+ public static void main(String[] args) throws Exception {
+ runTest(testname, jarClasses);
+ }
+}
diff --git a/jdk/test/com/sun/jdi/cds/CDSJDITest.java b/jdk/test/com/sun/jdi/cds/CDSJDITest.java
new file mode 100644
index 00000000000..f935b37c660
--- /dev/null
+++ b/jdk/test/com/sun/jdi/cds/CDSJDITest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ * 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.
+ */
+
+/*
+ * Helper superclass for launching JDI tests out of the CDS archive.
+*/
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+import java.io.*;
+import java.util.ArrayList;
+import sun.tools.jar.Main;
+
+public class CDSJDITest {
+ private static final String classesDir = System.getProperty("test.classes");
+
+ public static void runTest(String testname, String[] jarClasses) throws Exception {
+ File jarClasslistFile = makeClassList(jarClasses);
+ String appJar = buildJar(testname, jarClasses);
+
+ // These are the arguments passed to createJavaProcessBuilder() to launch
+ // the JDI test.
+ String[] testArgs = {
+ // JVM Args:
+ // These first three properties are setup by jtreg, and must be passed
+ // to the JDI test subprocess because it needs them in order to
+ // pass them to the subprocess it will create for the debuggee. This
+ // is how the JPRT -javaopts are passed to the debggee. See
+ // VMConnection.getDebuggeeVMOptions().
+ getPropOpt("test.classes"),
+ getPropOpt("test.java.opts"),
+ getPropOpt("test.vm.opts"),
+ // Pass -showversion to the JDI test just so we get a bit of trace output.
+ "-showversion",
+ // Main class:
+ testname,
+ // Args to the Main Class:
+ // These argument all follow the above argument, and are
+ // in fact passed to .main() as java arguments. will
+ // pass them as JVM arguments to the debuggee process it creates.
+ "-Xbootclasspath/a:" + appJar,
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+TraceClassPaths",
+ "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
+ "-Xshare:on",
+ "-showversion"
+ };
+
+ // Dump the archive
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xbootclasspath/a:" + appJar,
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
+ "-XX:ExtraSharedClassListFile=" + jarClasslistFile.getPath(),
+ "-Xshare:dump");
+ OutputAnalyzer outputDump = executeAndLog(pb, "exec");
+ for (String jarClass : jarClasses) {
+ outputDump.shouldNotContain("Cannot find " + jarClass);
+ }
+ outputDump.shouldContain("Loading classes to share");
+ outputDump.shouldHaveExitValue(0);
+
+ // Run the test specified JDI test
+ pb = ProcessTools.createJavaProcessBuilder(true, testArgs);
+ OutputAnalyzer outputRun = executeAndLog(pb, "exec");
+ try {
+ outputRun.shouldContain("sharing");
+ outputRun.shouldHaveExitValue(0);
+ } catch (RuntimeException e) {
+ outputRun.shouldContain("Unable to use shared archive");
+ outputRun.shouldHaveExitValue(1);
+ }
+ }
+
+ public static String getPropOpt(String prop) {
+ String propVal = System.getProperty(prop);
+ if (propVal == null) propVal = "";
+ System.out.println(prop + ": '" + propVal + "'");
+ return "-D" + prop + "=" + propVal;
+ }
+
+ public static File makeClassList(String appClasses[]) throws Exception {
+ File classList = getOutputFile("test.classlist");
+ FileOutputStream fos = new FileOutputStream(classList);
+ PrintStream ps = new PrintStream(fos);
+
+ addToClassList(ps, appClasses);
+
+ ps.close();
+ fos.close();
+
+ return classList;
+ }
+
+ public static OutputAnalyzer executeAndLog(ProcessBuilder pb, String logName) throws Exception {
+ long started = System.currentTimeMillis();
+ OutputAnalyzer output = ProcessTools.executeProcess(pb);
+ writeFile(getOutputFile(logName + ".stdout"), output.getStdout());
+ writeFile(getOutputFile(logName + ".stderr"), output.getStderr());
+ System.out.println("[ELAPSED: " + (System.currentTimeMillis() - started) + " ms]");
+ System.out.println("[STDOUT]\n" + output.getStdout());
+ System.out.println("[STDERR]\n" + output.getStderr());
+ return output;
+ }
+
+ private static void writeFile(File file, String content) throws Exception {
+ FileOutputStream fos = new FileOutputStream(file);
+ PrintStream ps = new PrintStream(fos);
+ ps.print(content);
+ ps.close();
+ fos.close();
+ }
+
+ public static File getOutputFile(String name) {
+ File dir = new File(System.getProperty("test.classes", "."));
+ return new File(dir, getTestNamePrefix() + name);
+ }
+
+ private static void addToClassList(PrintStream ps, String classes[]) throws IOException {
+ if (classes != null) {
+ for (String s : classes) {
+ ps.println(s);
+ }
+ }
+ }
+
+ private static String testNamePrefix;
+
+ private static String getTestNamePrefix() {
+ if (testNamePrefix == null) {
+ StackTraceElement[] elms = (new Throwable()).getStackTrace();
+ if (elms.length > 0) {
+ for (StackTraceElement n: elms) {
+ if ("main".equals(n.getMethodName())) {
+ testNamePrefix = n.getClassName() + "-";
+ break;
+ }
+ }
+ }
+
+ if (testNamePrefix == null) {
+ testNamePrefix = "";
+ }
+ }
+ return testNamePrefix;
+ }
+
+ private static String buildJar(String jarName, String ...classNames)
+ throws Exception {
+
+ String jarFullName = classesDir + File.separator + jarName + ".jar";
+ createSimpleJar(classesDir, jarFullName, classNames);
+ return jarFullName;
+ }
+
+ private static void createSimpleJar(String jarClassesDir, String jarName,
+ String[] classNames) throws Exception {
+
+ ArrayList args = new ArrayList();
+ args.add("cf");
+ args.add(jarName);
+ addJarClassArgs(args, jarClassesDir, classNames);
+ createJar(args);
+ }
+
+ private static void addJarClassArgs(ArrayList args, String jarClassesDir,
+ String[] classNames) {
+
+ for (String name : classNames) {
+ args.add("-C");
+ args.add(jarClassesDir);
+ args.add(name + ".class");
+ }
+ }
+
+ private static void createJar(ArrayList args) {
+ Main jarTool = new Main(System.out, System.err, "jar");
+ if (!jarTool.run(args.toArray(new String[1]))) {
+ throw new RuntimeException("jar operation failed");
+ }
+ }
+}
diff --git a/jdk/test/com/sun/tools/attach/BasicTests.java b/jdk/test/com/sun/tools/attach/BasicTests.java
index 7d6f7aa43f2..30e6ed395b3 100644
--- a/jdk/test/com/sun/tools/attach/BasicTests.java
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java
@@ -21,17 +21,21 @@
* questions.
*/
-import com.sun.tools.attach.*;
+import java.io.File;
+import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
-import java.io.IOException;
-import java.util.Properties;
import java.util.List;
-import java.io.File;
+import java.util.Properties;
+
import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.JDKToolLauncher;
-import jdk.testlibrary.ProcessTools;
import jdk.testlibrary.ProcessThread;
+import jdk.testlibrary.ProcessTools;
+
+import com.sun.tools.attach.AgentInitializationException;
+import com.sun.tools.attach.AgentLoadException;
+import com.sun.tools.attach.VirtualMachine;
+import com.sun.tools.attach.VirtualMachineDescriptor;
/*
* @test
diff --git a/jdk/test/com/sun/tools/attach/RunnerUtil.java b/jdk/test/com/sun/tools/attach/RunnerUtil.java
index de2b70b2b36..71c25082580 100644
--- a/jdk/test/com/sun/tools/attach/RunnerUtil.java
+++ b/jdk/test/com/sun/tools/attach/RunnerUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -48,7 +48,7 @@ public class RunnerUtil {
*/
public static ProcessThread startApplication(String... additionalOpts) throws Throwable {
String classpath = System.getProperty("test.class.path", ".");
- String[] myArgs = concat(additionalOpts, new String [] { "-Dattach.test=true", "-classpath", classpath, "Application" });
+ String[] myArgs = concat(additionalOpts, new String [] { "-XX:+UsePerfData", "-Dattach.test=true", "-classpath", classpath, "Application" });
String[] args = Utils.addTestJavaOpts(myArgs);
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
ProcessThread pt = new ProcessThread("runApplication", (line) -> line.equals(Application.READY_MSG), pb);
diff --git a/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java b/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java
index 9dd36dda9e3..698785274a9 100644
--- a/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java
+++ b/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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,6 +28,7 @@
@author Oleg Pekhovskiy: area=awt-choice
@library ../../regtesthelpers
@library ../../../../lib/testlibrary
+ @modules java.desktop/sun.awt
@build Util
@build jdk.testlibrary.OSInfo
@run main ItemStateChangeTest
diff --git a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java b/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java
index 977c5fa67c0..9eb0dbc93e1 100644
--- a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java
+++ b/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -45,6 +45,7 @@ import sun.awt.image.MultiResolutionImage;
* @summary [macosx] Custom Cursor HiDPI support
* @author Alexander Scherbatiy
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt.image
* @build jdk.testlibrary.OSInfo
* @run applet/manual=yesno MultiResolutionCursorTest.html
*/
diff --git a/jdk/test/java/awt/Desktop/8064934/bug8064934.java b/jdk/test/java/awt/Desktop/8064934/bug8064934.java
index ca1c451ccc1..66091afb5ae 100644
--- a/jdk/test/java/awt/Desktop/8064934/bug8064934.java
+++ b/jdk/test/java/awt/Desktop/8064934/bug8064934.java
@@ -26,6 +26,7 @@
* @summary Incorrect Exception message from java.awt.Desktop.open()
* @author Dmitry Markov
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
* @build jdk.testlibrary.OSInfo
* @run main bug8064934
*/
diff --git a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
index 0a6288d896d..3053d793043 100644
--- a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ b/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
* @test
* @bug 8043705
* @summary Can't exit color chooser dialog when running as an applet
+ * @modules java.desktop/sun.awt
* @run main CloseDialogTest
*/
public class CloseDialogTest {
diff --git a/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java b/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java
index 7a671b7b6de..c2d01180ca8 100644
--- a/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java
+++ b/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 8031694
@summary [macosx] TwentyThousandTest test intermittently hangs
@author Oleg Pekhovskiy
+ @modules java.desktop/sun.awt
@run main EDTShutdownTest
*/
diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
index 3e8611d2e02..8f5e722fb68 100644
--- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
+++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
@@ -1,5 +1,5 @@
diff --git a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
index 58f4bb96989..50cf7b018dc 100644
--- a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
+++ b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011,2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011,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 @@
* @bug 8004584
* @summary Tests 8004584
* @author anthony.petrov@oracle.com, petr.pchelko@oracle.com
+ * @modules java.desktop/sun.awt
*/
import java.awt.*;
diff --git a/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java b/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java
index e41f33cec05..7b75001f42d 100644
--- a/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java
+++ b/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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 @@
* @bug 4171596 6699589
* @summary Checks that the posting of events between the PostEventQueue
* @summary and the EventQueue maintains proper ordering.
+ * @modules java.desktop/sun.awt
* @run main PostEventOrderingTest
* @author fredx
*/
diff --git a/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java b/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java
index 570ddcd46fe..c59b7b39df4 100644
--- a/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java
+++ b/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
@test
@bug 4913324
@author Oleg Sukhodolsky: area=eventqueue
+ @modules java.desktop/sun.awt
@run main/timeout=30 PushPopTest
*/
diff --git a/jdk/test/java/awt/FileDialog/8017487/bug8017487.java b/jdk/test/java/awt/FileDialog/8017487/bug8017487.java
new file mode 100644
index 00000000000..c9cd370e10a
--- /dev/null
+++ b/jdk/test/java/awt/FileDialog/8017487/bug8017487.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/* @test
+ @bug 8017487
+ @summary filechooser in Windows-Libraries folder: columns are mixed up
+ @author Semyon Sadetsky
+ @library /lib/testlibrary
+ @build jdk.testlibrary.OSInfo
+ @run main bug8017487
+ */
+
+
+import jdk.testlibrary.OSInfo;
+
+import sun.awt.shell.ShellFolder;
+import sun.awt.shell.ShellFolderColumnInfo;
+import javax.swing.filechooser.FileSystemView;
+import java.io.File;
+
+public class bug8017487
+{
+ public static void main(String[] p_args) throws Exception {
+ if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS &&
+ OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_VISTA) > 0 ) {
+ test();
+ System.out.println("ok");
+ }
+ }
+
+ private static void test() throws Exception {
+ FileSystemView fsv = FileSystemView.getFileSystemView();
+ File def = new File(fsv.getDefaultDirectory().getAbsolutePath());
+ ShellFolderColumnInfo[] defColumns =
+ ShellFolder.getShellFolder(def).getFolderColumns();
+
+ File[] files = fsv.getHomeDirectory().listFiles();
+ for (File file : files) {
+ if( "Libraries".equals(ShellFolder.getShellFolder( file ).getDisplayName())) {
+ File[] libs = file.listFiles();
+ for (File lib : libs) {
+ ShellFolder libFolder =
+ ShellFolder.getShellFolder(lib);
+ if( "Library".equals(libFolder.getFolderType() ) ) {
+ ShellFolderColumnInfo[] folderColumns =
+ libFolder.getFolderColumns();
+
+ for (int i = 0; i < defColumns.length; i++) {
+ if (!defColumns[i].getTitle()
+ .equals(folderColumns[i].getTitle()))
+ throw new RuntimeException("Columnn " +
+ folderColumns[i].getTitle() +
+ " doesn't match " +
+ defColumns[i].getTitle());
+ }
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html b/jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html
new file mode 100644
index 00000000000..a36a20661ba
--- /dev/null
+++ b/jdk/test/java/awt/FileDialog/FileDialogOpenDirTest/FileDialogOpenDirTest.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+FileDialogOpenDirTest
+
+
+
+FileDialogOpenDirTest
+
+See the dialog box (usually in upper left corner) for instructions
+
+
+ * @modules java.datatransfer
*/
public class EqualsHashCodeSymmetryTest {
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java
index a3a7d2d53cd..4fe578c8351 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4274267
@summary Tests that externalized DataFlavor is restored properly
@author prs@sparc.spb.su: area=
+ @modules java.datatransfer
@run main ExternalizeTest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java
index f52af36d098..1b5e2ecdf5c 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4260874
@summary Tests that DataFlavor.getReaderForText do not throw NPE when transferObject is null
@author tdv@sparc.spb.su: area=
+ @modules java.datatransfer
@run main GetReaderForTextIAEForStringSelectionTest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java
index 7b503962b9f..b075fd20ccb 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4260874
@summary Tests that DataFlavor.getReaderForText do not throw NPE when transferObject is null
@author tdv@sparc.spb.su: area=
+ @modules java.datatransfer
@run main GetReaderForTextNPETest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java
index 50f1dde894a..e1ffafb8041 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,6 +27,7 @@
@summary Tests that long (more than 64K) MimeType can be serialized
and deserialized.
@author gas@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
@run main MimeTypeSerializationTest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java
index 40e899169af..87cfd3f9070 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4212613
@summary tests that DataFlavor(String) doesn't through Exception if no "class=" specified.
@author prs@sparc.spb.su: area=
+ @modules java.datatransfer
@run main NoClassParameterTest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java b/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java
index 6c794ca9383..8527d153e07 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4260860
@summary tests that DataFlavor.normalizeMimeTypeParameter() returns parm value
@author ssi@sparc.spb.su area=
+ @modules java.datatransfer
@run main NormalizeMimeTypeParameter
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java b/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java
index 2dbe746f2e1..7106847c6bc 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4274234
@summary Tests that DataFlavor.getReaderForText() doesn't throw UnsupportedEncodingException for unicode text
@author prs@sparc.spb.su: area=
+ @modules java.datatransfer
@run main ReaderForUnicodeText
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java
index 21cde56738d..80118af14d6 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4370469
@summary tests that selectBestTextFlavor doesn't throw NPE
@author prs@sparc.spb.su: area=
+ @modules java.datatransfer
@run main SelectBestFlavorNPETest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java
index 7b7d5dd3c98..41a060abe37 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -28,6 +28,7 @@
is a null array or an empty array or an array which doesn't contain
a text flavor in a supported encoding.
@author das@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
@run main SelectBestTextFlavorBadArrayTest
*/
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java
index 91b6c6769ff..85c6a827742 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@bug 4250768
@summary tests that DataFlavor.toString() does not throw NPE
@author prs@sparc.spb.su: area=
+ @modules java.datatransfer
@run main ToStringNullPointerTest
*/
diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java b/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java
index 6023618e6e3..2a34b5b88e7 100644
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,7 @@ import java.awt.datatransfer.Clipboard;
* @test
* @summary Check Clipboard constructor and getName() method do not throw
* exceptions in headless mode
+ * @modules java.datatransfer
* @run main/othervm -Djava.awt.headless=true HeadlessClipboard
*/
diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java b/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java
index 0f2cb08a63d..ee1bbd3ecb6 100644
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,7 @@ import java.awt.datatransfer.DataFlavor;
* @test
* @summary Check that DataFlavor constructors do not throw unexpected exceptions
* in headless mode
+ * @modules java.datatransfer
* @run main/othervm -Djava.awt.headless=true HeadlessDataFlavor
*/
diff --git a/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java b/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java
index 741d3f9c019..25409cda92d 100644
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,6 +28,7 @@ import java.awt.datatransfer.SystemFlavorMap;
* @test
* @summary Check that SystemFlavorMap constructor does not throw unexpected
* exceptions in headless mode
+ * @modules java.datatransfer
* @run main/othervm -Djava.awt.headless=true HeadlessSystemFlavorMap
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java
index dfffc3a653a..2065615526a 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.Vector;
* adding new mappings, one-way and two-way, and to update
* existing mappings.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main AddFlavorForNativeTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
index e12e90c2200..73d9eb4245a 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -38,6 +38,7 @@ import java.nio.charset.Charset;
* that all entries are present, and order is maintained.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
* @author dmitriy.ermashov@oracle.com
+ * @modules java.datatransfer
* @run main AddFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java
index 8f627b8233d..9ef8842d7a8 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.Vector;
* adding new mappings, one-way and two-way, and to update
* existing mappings.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main AddNativeForFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java
index d6dc8634e55..2e59cdd2df4 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,6 +36,7 @@ import java.util.*;
* DataFlavors. The mappings will be verified by examining
* that all entries are present.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main AddNativeTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java
index b3dbe4465e9..90aae80e695 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,6 +27,7 @@
@summary tests that addUnencodedNativeForFlavor()/addFlavorForUnencodedNative()
do not allow to duplicate mappings
@author das@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
@run main DuplicateMappingTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java
index b994bb735d1..9f4c234509e 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,6 +32,7 @@ import java.util.Map;
* @bug 8028230
* @summary Checks that SystemFlavorMap.getNativesForFlavor returns a list without duplicates
* @author Petr Pchelko
+ * @modules java.datatransfer
* @run main DuplicatedNativesTest
*/
public class DuplicatedNativesTest {
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java
index d3590b55601..52361c673b3 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -38,6 +38,7 @@ import java.util.Vector;
* returned, and with unknown Encoded String native where
* two-way mapping should be established.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main GetFlavorsForNewNativeTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java
index 837683026f1..d031b670a1f 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -28,6 +28,7 @@
only if there are no mappings for the DataFlavor and the mappings
were not explicitly removed
@author das@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
@run main GetNativesForFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java
index 01ed571779b..30abd5676eb 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.Vector;
* passing an unknown DataFlavor where two-way mapping
* should be established.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main GetNativesForNewFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java
index a525323bd75..035dbf13d6f 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,6 +36,7 @@ import java.awt.datatransfer.SystemFlavorMap;
* - setNativesForFlavor(DataFlavor flav, String[] natives)
* - setFlavorsForNative(String nat, DataFlavor[] flavors)
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main InvalidMapArgumentsTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java
index 401da6e146e..cf496ceecbe 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.*;
* include all entries and that the correct order is
* maintained.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main ManyFlavorMapTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java
index b0d8587afa3..3d067e08c1e 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -30,6 +30,7 @@ import java.util.List;
@bug 4512530 8027148
@summary tests that mappings for text flavors are generated properly
@author das@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
*/
public class MappingGenerationTest {
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java
index e106c3a78c0..1d24034b31f 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -39,6 +39,7 @@ import java.util.Vector;
* DataFlavors. The mappings will be verified by examining
* that all entries are present, and order is maintained.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main SetDataFlavorsTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java
index 167c78e473e..db6a193dd34 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.Vector;
* adding new mappings, one-way and two-way, and to update
* existing mappings.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main SetFlavorsForNativeTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java
index 795b24322c6..35e11aa4675 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@ import java.util.Vector;
* adding new mappings, one-way and two-way, and to update
* existing mappings.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main SetNativesForFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java
index 34fc792aeca..33f96ce033c 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,6 +27,7 @@
@summary tests that getNativesForFlavor()/getFlavorsForNative() return the
same list as was set with setNativesForFlavor()/setFlavorsForNative()
@author das@sparc.spb.su area=datatransfer
+ @modules java.datatransfer
@run main SetNativesForFlavorTest
*/
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java
index d655d6374aa..8d67c73f1eb 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,6 +39,7 @@ import java.util.Vector;
* DataFlavors. The mappings will be verified by examining
* that all entries are present, and order is maintained.
* @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
* @run main SetNativesTest
*/
diff --git a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html b/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html
index 39bbfcab4cd..a94f1e28293 100644
--- a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html
+++ b/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html
@@ -27,6 +27,7 @@
@bug 4985250
@summary COMPONENT_MOVED/RESIZED tardy events shouldn't be generated.
@author tav@sparc.spb.su
+ @modules java.desktop/sun.awt
@run applet MovedResizedTardyEventTest.html
-->
diff --git a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
index 741c4813903..9eac6021fe4 100644
--- a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
@@ -26,6 +26,7 @@
@bug 8068283
@summary Checks that +Char accelerators work when pressed in a text component
@author Anton Nashatyrev
+@modules java.desktop/sun.awt
@run main AltCharAcceleratorTest
*/
diff --git a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
index 6878c3f42a8..5b62bf6712a 100644
--- a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
+++ b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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,6 +28,7 @@
@author anton.tarasov: area=awt.focus
@library ../../../regtesthelpers
@library ../../../../../lib/testlibrary
+ @modules java.desktop/sun.awt
@build jdk.testlibrary.OSInfo
@build Util
@run main SwallowKeyEvents
diff --git a/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java b/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java
index 2855767e04e..762cc4acaa4 100644
--- a/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java
+++ b/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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 @@
@bug 6960516
@summary check if the ungrab event has the ID < AWTEvent.RESERVED_ID_MAX
@author Andrei Dmitriev : area=awt.event
+ @modules java.desktop/sun.awt
@run main UngrabID
*/
diff --git a/jdk/test/java/awt/im/8041990/bug8041990.java b/jdk/test/java/awt/im/8041990/bug8041990.java
index ee813e6715c..6c2af47d1ab 100644
--- a/jdk/test/java/awt/im/8041990/bug8041990.java
+++ b/jdk/test/java/awt/im/8041990/bug8041990.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,6 +27,7 @@
@bug 8041990
@summary Language specific keys does not work in applets when opened outside the browser
@author Petr Pchelko
+ @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java b/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java
index af809243acc..b7d557cca2d 100644
--- a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java
+++ b/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -30,6 +30,8 @@ import sun.awt.image.MultiResolutionImage;
* @bug 8033534 8035069
* @summary [macosx] Get MultiResolution image from native system
* @author Alexander Scherbatiy
+ * @modules java.desktop/sun.awt
+ * java.desktop/sun.awt.image
* @run main NSImageToMultiResolutionImageTest
*/
diff --git a/jdk/test/java/awt/image/MultiResolutionImageTest.java b/jdk/test/java/awt/image/MultiResolutionImageTest.java
index 21864f9be52..70ed2a4c5f4 100644
--- a/jdk/test/java/awt/image/MultiResolutionImageTest.java
+++ b/jdk/test/java/awt/image/MultiResolutionImageTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -47,6 +47,8 @@ import sun.awt.image.MultiResolutionImage;
* @bug 8011059
* @author Alexander Scherbatiy
* @summary [macosx] Make JDK demos look perfect on retina displays
+ * @modules java.desktop/sun.awt
+ * java.desktop/sun.awt.image
* @run main MultiResolutionImageTest CUSTOM
* @run main MultiResolutionImageTest TOOLKIT_PREPARE
* @run main MultiResolutionImageTest TOOLKIT_LOAD
diff --git a/jdk/test/java/awt/image/mlib/MlibOpsTest.java b/jdk/test/java/awt/image/mlib/MlibOpsTest.java
index 06b9583d370..0f1fe717c78 100644
--- a/jdk/test/java/awt/image/mlib/MlibOpsTest.java
+++ b/jdk/test/java/awt/image/mlib/MlibOpsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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 @@
* @bug 6556332 8011992 8012112
* @summary Test verifies that on-demnad loading of medialib library does
* not break imageing ops based on this library.
+ * @modules java.desktop/sun.awt.image
* @run main MlibOpsTest
* @run main/othervm/policy=mlib.security.policy MlibOpsTest
*/
diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
index 57a54386f0c..613a6d333f8 100644
--- a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
+++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -39,6 +39,8 @@ import sun.awt.image.MultiResolutionToolkitImage;
* @bug 8040291
* @author Alexander Scherbatiy
* @summary [macosx] Http-Images are not fully loaded when using ImageIcon
+ * @modules java.desktop/sun.awt
+ * java.desktop/sun.awt.image
* @run main MultiResolutionToolkitImageTest
*/
public class MultiResolutionToolkitImageTest {
diff --git a/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java b/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java
index 9f8598c14b7..4cbe1954ae4 100644
--- a/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java
+++ b/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java
@@ -26,6 +26,7 @@
@bug 6799551
@summary Extended key codes for small letters undefined
@author Andrei Dmitriev: area=awt.keyboard
+ @modules java.desktop/sun.awt
@run main EqualKeyCode
*/
diff --git a/jdk/test/java/awt/print/bug8023392/bug8023392.html b/jdk/test/java/awt/print/bug8023392/bug8023392.html
index af6951249c5..c51ae001e2e 100644
--- a/jdk/test/java/awt/print/bug8023392/bug8023392.html
+++ b/jdk/test/java/awt/print/bug8023392/bug8023392.html
@@ -1,5 +1,5 @@
diff --git a/jdk/test/java/awt/xembed/server/RunTestXEmbed.java b/jdk/test/java/awt/xembed/server/RunTestXEmbed.java
index f91d345d875..58f8ecfce3f 100644
--- a/jdk/test/java/awt/xembed/server/RunTestXEmbed.java
+++ b/jdk/test/java/awt/xembed/server/RunTestXEmbed.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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 @@
* @bug 4931668
* @summary Tests XEmbed server/client functionality
* @author Denis Mikhalkin: area=awt.xembed
+ * @modules java.desktop/sun.awt
* @compile JavaClient.java TesterClient.java TestXEmbedServer.java
* @run main/timeout=6000 RunTestXEmbed
*/
diff --git a/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java b/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java
index 2d4674350f0..05e729e3caf 100644
--- a/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java
+++ b/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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 @@
* @bug 4931668
* @summary Tests XEmbed server/client functionality
* @author denis mikhalkin: area=awt.xembed
+ * @modules java.desktop/sun.awt
* @compile JavaClient.java TesterClient.java TestXEmbedServer.java
* @run main/manual TestXEmbedServerJava
*/
diff --git a/jdk/test/java/beans/Introspector/Test6277246.java b/jdk/test/java/beans/Introspector/Test6277246.java
index 8b536690b24..857c484e6a3 100644
--- a/jdk/test/java/beans/Introspector/Test6277246.java
+++ b/jdk/test/java/beans/Introspector/Test6277246.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,6 +25,8 @@
* @test
* @bug 6277246
* @summary Tests problem with java.beans use of reflection
+ * @modules java.base/sun.misc
+ * java.desktop
* @run main/othervm Test6277246
* @author Jeff Nisewanger
*/
diff --git a/jdk/test/java/beans/Introspector/TestCacheRecursion.java b/jdk/test/java/beans/Introspector/TestCacheRecursion.java
index cb36deccb92..7dce257db32 100644
--- a/jdk/test/java/beans/Introspector/TestCacheRecursion.java
+++ b/jdk/test/java/beans/Introspector/TestCacheRecursion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -28,6 +28,7 @@ import com.sun.beans.util.Cache;
* @bug 8039137
* @summary Tests Cache recursion
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.util
* @compile -XDignore.symbol.file TestCacheRecursion.java
* @run main TestCacheRecursion
*/
diff --git a/jdk/test/java/beans/Introspector/TestTypeResolver.java b/jdk/test/java/beans/Introspector/TestTypeResolver.java
index 485b117da18..4b28e8ea0e2 100644
--- a/jdk/test/java/beans/Introspector/TestTypeResolver.java
+++ b/jdk/test/java/beans/Introspector/TestTypeResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,8 @@
* @test
* @summary Tests com.sun.beans.TypeResolver
* @author Eamonn McManus
+ * @modules java.base/sun.reflect.generics.reflectiveObjects
+ * java.desktop/com.sun.beans
*/
import com.sun.beans.TypeResolver;
diff --git a/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java b/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java
index ff9067d6ab2..9c55b3dfc4c 100644
--- a/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java
+++ b/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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,8 +26,10 @@
* @bug 6380849
* @summary Tests PropertyEditor finder
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.editors
* @compile -XDignore.symbol.file TestPropertyEditor.java
* @run main TestPropertyEditor
+ * @key headful
*/
import editors.SecondBeanEditor;
diff --git a/jdk/test/java/beans/PropertyEditor/Test6397609.java b/jdk/test/java/beans/PropertyEditor/Test6397609.java
index bfbadd6f43d..6893f66edf9 100644
--- a/jdk/test/java/beans/PropertyEditor/Test6397609.java
+++ b/jdk/test/java/beans/PropertyEditor/Test6397609.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,9 @@
* @bug 6397609
* @summary Tests autocleaning
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.beans.PropertyEditorManager;
diff --git a/jdk/test/java/beans/PropertyEditor/Test6963811.java b/jdk/test/java/beans/PropertyEditor/Test6963811.java
index d864cc623bc..b6856ffb91d 100644
--- a/jdk/test/java/beans/PropertyEditor/Test6963811.java
+++ b/jdk/test/java/beans/PropertyEditor/Test6963811.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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 @@
* @bug 6963811
* @summary Tests deadlock in PropertyEditorManager
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.editors
* @compile -XDignore.symbol.file Test6963811.java
* @run main Test6963811
*/
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java b/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java
index 1a5e7eae165..c274564484c 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510 6498158
* @summary Tests PropertyEditor for value of type Boolean with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java b/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java
index 5d6566e6a9d..caa2820625a 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498158
* @summary Tests PropertyEditor for value of type Boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java b/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java
index 02e11ad0b53..0ca17b8a1cd 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498158 6498171
* @summary Tests PropertyEditor for null value of type Boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java b/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java
index 9706892e9e8..ece4357347e 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596 6498158
* @summary Tests PropertyEditor for value of type Boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanType.java b/jdk/test/java/beans/PropertyEditor/TestBooleanType.java
index e842c791831..71553a32421 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type boolean with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java
index 653422a0e41..bf13718be09 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java
index cda69ed9dc8..7fcac9f2db4 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java
index b5a1efab0d6..b0c44a6a63a 100644
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type boolean
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestBooleanTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClass.java b/jdk/test/java/beans/PropertyEditor/TestByteClass.java
index 71b53ae2e4b..393dabad722 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Byte with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java b/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java
index b1f729d6d12..414e43aa56c 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java b/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java
index 093c14c905f..f5e678ec282 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java b/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java
index 908c267ebc0..5a61febbd4d 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteType.java b/jdk/test/java/beans/PropertyEditor/TestByteType.java
index 5a2aa7db5f5..5d8a01d8169 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type byte with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java
index dd59b6a5f6b..0e013be6c9f 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java
index 24de2bad484..25053c45fe5 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java
index 9bdbdab2406..ffbe176ab87 100644
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type byte
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestByteTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClass.java b/jdk/test/java/beans/PropertyEditor/TestColorClass.java
index 3bf219b4b15..e449baf1064 100644
--- a/jdk/test/java/beans/PropertyEditor/TestColorClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Color with security manager
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Color;
diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java b/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java
index 0e5ca302918..7135c7ba377 100644
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Color
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Color;
diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java b/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java
index 0094232ab9b..4e77a8a7949 100644
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Color
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Color;
diff --git a/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java b/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java
index 3602d71404a..1cd9d8cd3ed 100644
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,10 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Color
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Color;
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java b/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java
index 4269a74cc5a..b1ffde0a9eb 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Double with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java b/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java
index 59aae97a3a8..7657cd17bae 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java b/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java
index 094165f08f3..ee6ba40955f 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java b/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java
index f59bddc35fe..8b7650a6cf7 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleType.java b/jdk/test/java/beans/PropertyEditor/TestDoubleType.java
index 619775e27ea..7dc21b95d86 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type double with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java
index a3bc965749c..15b44733c32 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java
index 379b2a9f2b8..8b6245257e7 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java
index e2669f43363..d2108a12f3a 100644
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type double
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestDoubleTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClass.java b/jdk/test/java/beans/PropertyEditor/TestEnumClass.java
index 0737d7c939c..8aec51b0299 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6219769 6258510
* @summary Tests PropertyEditor for value of type Enum with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java b/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java
index be9174ea47b..13e644fbf5f 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6219769
* @summary Tests PropertyEditor for value of type Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java b/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java
index 699b1559eae..3e410fe5264 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6219769 6498171
* @summary Tests PropertyEditor for null value of type Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java b/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java
index d023fbd0d0a..873bdbdc3e9 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4222827 4506596 6219769
* @summary Tests PropertyEditor for value of type Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java b/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java
index a2088ae424b..8ff3d2e55d7 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,9 @@
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumSubclass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java
index a89a3497420..3b24cb887d0 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,9 @@
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumSubclassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java
index 07f7b399e4f..08b6c172397 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,9 @@
* @bug 6736248
* @summary Tests PropertyEditor for null value of subtype Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumSubclassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java
index 790bfd13be5..3cdaa7ebcb3 100644
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,9 @@
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestEnumSubclassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClass.java b/jdk/test/java/beans/PropertyEditor/TestFloatClass.java
index 8fc663f8b40..cd231d33e68 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Float with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java b/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java
index a212ace21bd..5d4dacc6a64 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java b/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java
index 93715d7575b..7ce118928ff 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java b/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java
index 2d5c8073efc..048a266e3da 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatType.java b/jdk/test/java/beans/PropertyEditor/TestFloatType.java
index 2946827438c..84d00f99e7c 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type float with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java
index 6cf6eca7315..7bf8fa83574 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java
index 33a1b25cb54..37d68391214 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java
index 021ab5e7fc2..c94aa11eb9d 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type float
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestFloatTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClass.java b/jdk/test/java/beans/PropertyEditor/TestFontClass.java
index 304af188093..742a6d65d9b 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFontClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596 6258510 6538853
* @summary Tests PropertyEditor for value of type Font with security manager
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Font;
diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java b/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java
index e63b0d60830..8946b9a5c3e 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596 6538853
* @summary Tests PropertyEditor for value of type Font
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Font;
diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java b/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java
index 4da531c26d9..1151ddced30 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,10 @@
* @bug 4506596 6498171 6538853
* @summary Tests PropertyEditor for null value of type Font
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Font;
diff --git a/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java b/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java
index b8f89fc74da..af5e881c0cc 100644
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,10 @@
* @bug 4222827 4506596 6538853
* @summary Tests PropertyEditor for value of type Font
* @author Sergey Malenkov
+ * @key headful
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
import java.awt.Font;
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java b/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java
index 38a793c7a3d..10657042489 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510 6498158
* @summary Tests PropertyEditor for value of type Integer with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java b/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java
index 05a90b7e7fd..70ff6b3740c 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498158
* @summary Tests PropertyEditor for value of type Integer
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java b/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java
index 95d171cc7e5..7817bbd37c5 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498158 6498171
* @summary Tests PropertyEditor for null value of type Integer
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java b/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java
index 3bf0abacd68..5e62c653ed6 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596 6498158
* @summary Tests PropertyEditor for value of type Integer
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerType.java b/jdk/test/java/beans/PropertyEditor/TestIntegerType.java
index 1e803741277..34a2261ea69 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type int with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java
index 029f03945e6..0a4b6ea2eb8 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type int
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java
index db552647295..79ff0b92a12 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type int
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java
index 3c6584137db..bb9cca5a03f 100644
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type int
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestIntegerTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClass.java b/jdk/test/java/beans/PropertyEditor/TestLongClass.java
index 486aa9be518..5d06f0c0515 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Long with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java b/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java
index b183575ab38..e7076047da1 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java b/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java
index ee68badc23c..ee5eb4891c6 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java b/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java
index 8dbe35a4317..ed1b8eee1b0 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongType.java b/jdk/test/java/beans/PropertyEditor/TestLongType.java
index 944b4f1c60e..a32cd1506ca 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type long with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java
index 4dd48ec3485..2aa9f78723a 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java
index c490ce04492..d416c225b4d 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java
index 476e7735ba2..a85b4d5c49d 100644
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type long
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestLongTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClass.java b/jdk/test/java/beans/PropertyEditor/TestShortClass.java
index 1fa18455c3a..875c3a0bf78 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type Short with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java b/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java
index 5785d8c5d07..1d75bde0151 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type Short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java b/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java
index 0017e19e3e0..b227901412e 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type Short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java b/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java
index dd3a6601756..2fa6566662b 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type Short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortClassValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortType.java b/jdk/test/java/beans/PropertyEditor/TestShortType.java
index 429d91ee0ac..25a24a8fbb9 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortType.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510
* @summary Tests PropertyEditor for value of type short with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortType {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java b/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java
index 2e391c2739d..ec2cca487b8 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596
* @summary Tests PropertyEditor for value of type short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortTypeJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java b/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java
index 3f5a811830b..78d3178a373 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6498171
* @summary Tests PropertyEditor for null value of type short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortTypeNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java b/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java
index f7473e7ff75..a25c532e302 100644
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4222827 4506596
* @summary Tests PropertyEditor for value of type short
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestShortTypeValue {
diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClass.java b/jdk/test/java/beans/PropertyEditor/TestStringClass.java
index 5d0979705bc..2a2a6d718b4 100644
--- a/jdk/test/java/beans/PropertyEditor/TestStringClass.java
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6258510 6457659
* @summary Tests PropertyEditor for value of type String with security manager
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestStringClass {
diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java b/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java
index 55538049b4c..bd375a067dc 100644
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6457659
* @summary Tests PropertyEditor for value of type String
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestStringClassJava {
diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java b/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java
index a1be503cdf4..31d48da5794 100644
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,9 @@
* @bug 4506596 6457659 6498171
* @summary Tests PropertyEditor for null value of type String
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestStringClassNull {
diff --git a/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java b/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java
index 93afb1b4047..aa76e33b4d6 100644
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,6 +28,9 @@
* @bug 6457659
* @summary Tests PropertyEditor for value of type String
* @author Sergey Malenkov
+ * @modules java.compiler
+ * java.desktop
+ * jdk.compiler
*/
public class TestStringClassValue {
diff --git a/jdk/test/java/beans/TEST.properties b/jdk/test/java/beans/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/java/beans/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java b/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
index 1bce91ec858..0b8cef769e7 100644
--- a/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,6 +33,7 @@ import java.util.List;
* @bug 8028054
* @summary Tests that cached constructors have synchronized access
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.finder
* @compile -XDignore.symbol.file TestConstructorFinder.java
* @run main TestConstructorFinder
*/
diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java b/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
index 7ff7a9077b3..2b9b8a40ff0 100644
--- a/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,6 +33,7 @@ import java.util.List;
* @bug 8028054
* @summary Tests that cached methods have synchronized access
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.finder
* @compile -XDignore.symbol.file TestMethodFinder.java
* @run main TestMethodFinder
*/
diff --git a/jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java b/jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java
index 1f216b4abb0..4861f625ff9 100644
--- a/jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_ScrollPane.java
@@ -25,6 +25,7 @@
* @test
* @bug 6402062 6487891
* @summary Tests ScrollPane encoding
+ * @key headful
* @author Sergey Malenkov
*/
diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Date.java b/jdk/test/java/beans/XMLEncoder/java_sql_Date.java
index e1a8746599f..7278e81e836 100644
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Date.java
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Date.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,8 @@
* @bug 4733558 6471539
* @summary Tests Date encoding
* @author Sergey Malenkov
+ * @modules java.desktop
+ * java.sql
*/
import java.sql.Date;
diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Time.java b/jdk/test/java/beans/XMLEncoder/java_sql_Time.java
index 87d9dc5c804..589bfa8f16a 100644
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Time.java
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Time.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,8 @@
* @bug 4733558 6471539
* @summary Tests Time encoding
* @author Sergey Malenkov
+ * @modules java.desktop
+ * java.sql
*/
import java.sql.Time;
diff --git a/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java b/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java
index 3d1863fd08c..94d473155c3 100644
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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,8 @@
* @bug 4733558 6471539
* @summary Tests Timestamp encoding
* @author Sergey Malenkov
+ * @modules java.desktop
+ * java.sql
*/
import java.sql.Timestamp;
diff --git a/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java b/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
index ca639277975..b6e5b86b18b 100644
--- a/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
+++ b/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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 @@
* @bug 6589532
* @summary Tests PrintColorUIResource value encoding
* @author Sergey Malenkov
+ * @modules java.desktop/sun.swing
*/
import java.awt.Color;
diff --git a/jdk/test/java/io/FilterOutputStream/SuppressedException.java b/jdk/test/java/io/FilterOutputStream/SuppressedException.java
new file mode 100644
index 00000000000..9bd982a5d32
--- /dev/null
+++ b/jdk/test/java/io/FilterOutputStream/SuppressedException.java
@@ -0,0 +1,195 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+import java.io.BufferedOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/*
+ * @test
+ * @bug 8042377
+ * @summary Ensure suppressed exceptions are properly handled in close()
+ */
+public class SuppressedException {
+ private static final String CLOSE_MESSAGE = "Close exception";
+ private static final String FLUSH_MESSAGE = "Flush exception";
+ private static final String SAME_MESSAGE = "Same exception";
+
+ public static void main(String[] args) throws java.io.IOException {
+ SuppressedException test = new SuppressedException();
+ test.test();
+ }
+
+ private FilterOutputStream createOutputStream(OutputStream out,
+ boolean isBuffered) {
+ return isBuffered ? new BufferedOutputStream(out) :
+ new FilterOutputStream(out);
+ }
+
+ private void test() {
+ int failures = 0;
+ FilterOutputStream buf;
+
+ boolean[] isBuffered = new boolean[] {false, true};
+ for (boolean buffered : isBuffered) {
+ System.err.println("\n>>> Buffered: " + buffered + " <<<");
+ System.err.flush();
+
+ try {
+ buf = createOutputStream(new OutputStreamFailsWithException(),
+ buffered);
+ buf.close();
+ System.err.println("\nNo IOException thrown for same exception");
+ failures++;
+ } catch (IOException expected) {
+ if (!expected.getMessage().equals(SAME_MESSAGE)) {
+ System.err.println("\nIOException with unexpected message thrown");
+ expected.printStackTrace();
+ failures++;
+ }
+ } catch (IllegalArgumentException unexpected) {
+ System.err.println("\nUnexpected IllegalArgumentException thrown");
+ unexpected.printStackTrace();
+ failures++;
+ }
+
+ try {
+ buf = createOutputStream(
+ new OutputStreamFailsWithException(false, false),
+ buffered);
+ buf.close();
+ } catch (IOException e) {
+ System.err.println("\nUnexpected IOException thrown");
+ e.printStackTrace();
+ failures++;
+ }
+
+ try {
+ buf = createOutputStream(
+ new OutputStreamFailsWithException(true, false),
+ buffered);
+ buf.close();
+ } catch (IOException e) {
+ if (!e.getMessage().equals(CLOSE_MESSAGE)) {
+ System.err.println("\nIOException with unexpected message thrown");
+ e.printStackTrace();
+ failures++;
+ }
+ }
+
+ try {
+ buf = createOutputStream(
+ new OutputStreamFailsWithException(false, true),
+ buffered);
+ buf.close();
+ } catch (IOException e) {
+ if (!e.getMessage().equals(FLUSH_MESSAGE)) {
+ System.err.println("\nIOException with unexpected message thrown");
+ e.printStackTrace();
+ failures++;
+ }
+ }
+
+ try {
+ buf = createOutputStream(
+ new OutputStreamFailsWithException(true, true),
+ buffered);
+ buf.close();
+ } catch (IOException e) {
+ if (!e.getMessage().equals(CLOSE_MESSAGE)) {
+ System.err.println("\nIOException with unexpected message thrown");
+ e.printStackTrace();
+ failures++;
+ }
+
+ Throwable[] suppressed = e.getSuppressed();
+ if (suppressed == null) {
+ System.err.println("\nExpected suppressed exception not present");
+ e.printStackTrace();
+ failures++;
+ } else if (suppressed.length != 1) {
+ System.err.println("\nUnexpected number of suppressed exceptions");
+ e.printStackTrace();
+ failures++;
+ } else if (!(suppressed[0] instanceof IOException)) {
+ System.err.println("\nSuppressed exception is not an IOException");
+ e.printStackTrace();
+ failures++;
+ } else if (!suppressed[0].getMessage().equals(FLUSH_MESSAGE)) {
+ System.err.println("\nIOException with unexpected message thrown");
+ e.printStackTrace();
+ failures++;
+ }
+ }
+ }
+
+ if (failures > 0) {
+ throw new RuntimeException("Test failed with " + failures + " errors");
+ } else {
+ System.out.println("Test succeeded.");
+ }
+ }
+
+ class OutputStreamFailsWithException extends OutputStream {
+ private final IOException sameException = new IOException(SAME_MESSAGE);
+
+ private final Boolean throwSeparateCloseException;
+ private final Boolean throwSeparateFlushException;
+
+ OutputStreamFailsWithException() {
+ throwSeparateCloseException = null;
+ throwSeparateFlushException = null;
+ }
+
+ OutputStreamFailsWithException(boolean throwCloseException,
+ boolean throwFlushException) {
+ throwSeparateCloseException = throwCloseException;
+ throwSeparateFlushException = throwFlushException;
+ }
+
+ @Override
+ public void write(int i) throws IOException {
+ throw new UnsupportedOperationException("");
+ }
+
+ @Override
+ public void flush() throws IOException {
+ System.out.println("flush()");
+ if (throwSeparateFlushException == null) {
+ throw sameException;
+ } else if (throwSeparateFlushException) {
+ throw new IOException(FLUSH_MESSAGE);
+ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ System.out.println("close()");
+ if (throwSeparateCloseException == null) {
+ throw sameException;
+ } else if (throwSeparateCloseException) {
+ throw new IOException(CLOSE_MESSAGE);
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/lang/ref/SoftReference/Pin.java b/jdk/test/java/lang/ref/SoftReference/Pin.java
index dbdf9be1b39..38cd56da242 100644
--- a/jdk/test/java/lang/ref/SoftReference/Pin.java
+++ b/jdk/test/java/lang/ref/SoftReference/Pin.java
@@ -76,6 +76,7 @@ public class Pin {
Thread.sleep(100); // yield, for what it's worth
}
} catch (OutOfMemoryError e) {
+ chain = null; // Free memory for further work.
System.err.println("Got OutOfMemoryError, as expected.");
}
diff --git a/jdk/test/java/math/BigInteger/ExtremeShiftingTests.java b/jdk/test/java/math/BigInteger/ExtremeShiftingTests.java
index 4f11c66e211..853b88668a2 100644
--- a/jdk/test/java/math/BigInteger/ExtremeShiftingTests.java
+++ b/jdk/test/java/math/BigInteger/ExtremeShiftingTests.java
@@ -25,6 +25,7 @@
* @test
* @bug 6371401
* @summary Tests of shiftLeft and shiftRight on Integer.MIN_VALUE
+ * @requires os.maxMemory >= 1g
* @run main/othervm -Xmx512m ExtremeShiftingTests
* @author Joseph D. Darcy
*/
diff --git a/jdk/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java b/jdk/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java
new file mode 100644
index 00000000000..77282c66d80
--- /dev/null
+++ b/jdk/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/* @test
+ * @bug 8081678
+ * @summary Tests for stream returning methods
+ * @library ../../util/stream/bootlib
+ * @build java.util.stream.OpTestCase
+ * @run testng/othervm NetworkInterfaceStreamTest
+ * @run testng/othervm -Djava.net.preferIPv4Stack=true NetworkInterfaceStreamTest
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Supplier;
+import java.util.stream.OpTestCase;
+import java.util.stream.Stream;
+import java.util.stream.TestData;
+
+public class NetworkInterfaceStreamTest extends OpTestCase {
+
+ @Test
+ public void testNetworkInterfaces() throws SocketException {
+ Supplier> ss = () -> {
+ try {
+ return NetworkInterface.networkInterfaces();
+ }
+ catch (SocketException e) {
+ throw new RuntimeException(e);
+ }
+ };
+
+ Collection expected = Collections.list(NetworkInterface.getNetworkInterfaces());
+ withData(TestData.Factory.ofSupplier("Top-level network interfaces", ss))
+ .stream(s -> s)
+ .expectedResult(expected)
+ .exercise();
+ }
+
+
+ private Collection getAllNetworkInterfaces() throws SocketException {
+ Collection anis = new ArrayList<>();
+ for (NetworkInterface ni : Collections.list(NetworkInterface.getNetworkInterfaces())) {
+ getAllSubNetworkInterfaces(ni, anis);
+ }
+ return anis;
+ }
+
+ private void getAllSubNetworkInterfaces(NetworkInterface ni, Collection result) {
+ result.add(ni);
+
+ for (NetworkInterface sni : Collections.list(ni.getSubInterfaces())) {
+ getAllSubNetworkInterfaces(sni, result);
+ }
+ }
+
+ private Stream allNetworkInterfaces() throws SocketException {
+ return NetworkInterface.networkInterfaces().flatMap(this::allSubNetworkInterfaces);
+ }
+
+ private Stream allSubNetworkInterfaces(NetworkInterface ni) {
+ return Stream.concat(
+ Stream.of(ni),
+ ni.subInterfaces().flatMap(this::allSubNetworkInterfaces));
+ }
+
+ @Test
+ public void testSubNetworkInterfaces() throws SocketException {
+ Supplier> ss = () -> {
+ try {
+ return allNetworkInterfaces();
+ }
+ catch (SocketException e) {
+ throw new RuntimeException(e);
+ }
+ };
+
+ Collection expected = getAllNetworkInterfaces();
+ withData(TestData.Factory.ofSupplier("All network interfaces", ss))
+ .stream(s -> s)
+ .expectedResult(expected)
+ .exercise();
+ }
+
+
+ @Test
+ public void testInetAddresses() throws SocketException {
+ Supplier> ss = () -> {
+ try {
+ return NetworkInterface.networkInterfaces().flatMap(NetworkInterface::inetAddresses);
+ }
+ catch (SocketException e) {
+ throw new RuntimeException(e);
+ }
+ };
+
+ Collection nis = Collections.list(NetworkInterface.getNetworkInterfaces());
+ Collection expected = new ArrayList<>();
+ for (NetworkInterface ni : nis) {
+ expected.addAll(Collections.list(ni.getInetAddresses()));
+ }
+ withData(TestData.Factory.ofSupplier("All inet addresses", ss))
+ .stream(s -> s)
+ .expectedResult(expected)
+ .exercise();
+ }
+
+
+}
diff --git a/jdk/test/java/nio/file/Files/probeContentType/Basic.java b/jdk/test/java/nio/file/Files/probeContentType/Basic.java
index 3980637a77e..4b379704ce3 100644
--- a/jdk/test/java/nio/file/Files/probeContentType/Basic.java
+++ b/jdk/test/java/nio/file/Files/probeContentType/Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4313887
+ * @bug 4313887 8129632
* @summary Unit test for probeContentType method
* @library ../..
* @build Basic SimpleFileTypeDetector
@@ -33,9 +33,9 @@ import java.nio.file.*;
import java.io.*;
/**
- * Uses Files.probeContentType to probe html file and custom file type.
+ * Uses Files.probeContentType to probe html file, custom file type, and minimal
+ * set of file extension to content type mappings.
*/
-
public class Basic {
static Path createHtmlFile() throws IOException {
@@ -51,6 +51,39 @@ public class Basic {
return Files.createTempFile("red", ".grape");
}
+ static void checkContentTypes(String[] extensions, String[] expectedTypes)
+ throws IOException {
+ if (extensions.length != expectedTypes.length) {
+ throw new IllegalArgumentException("Parameter array lengths differ");
+ }
+
+ int failures = 0;
+ for (int i = 0; i < extensions.length; i++) {
+ String extension = extensions[i];
+ Path file = Files.createTempFile("foo", "." + extension);
+ try {
+ String type = Files.probeContentType(file);
+ if (type == null) {
+ System.err.println("Content type of " + extension
+ + " cannot be determined");
+ failures++;
+ } else {
+ if (!type.equals(expectedTypes[i])) {
+ System.err.println("Content type: " + type
+ + "; expected: " + expectedTypes[i]);
+ failures++;
+ }
+ }
+ } finally {
+ Files.delete(file);
+ }
+ }
+
+ if (failures > 0) {
+ throw new RuntimeException("Test failed!");
+ }
+ }
+
public static void main(String[] args) throws IOException {
// exercise default file type detector
@@ -79,5 +112,17 @@ public class Basic {
Files.delete(file);
}
+ // Verify that common file extensions are mapped to the correct content
+ // types on Mac OS X only which has consistent Uniform Type Identifiers.
+ if (System.getProperty("os.name").contains("OS X")) {
+ String[] extensions = new String[]{
+ "jpg", "mp3", "mp4", "pdf", "png"
+ };
+ String[] expectedTypes = new String[]{
+ "image/jpeg", "audio/mpeg", "video/mp4", "application/pdf",
+ "image/png"
+ };
+ checkContentTypes(extensions, expectedTypes);
+ }
}
}
diff --git a/jdk/test/java/security/KeyStore/EntryMethods.java b/jdk/test/java/security/KeyStore/EntryMethods.java
index d627da23e17..396e04346fa 100644
--- a/jdk/test/java/security/KeyStore/EntryMethods.java
+++ b/jdk/test/java/security/KeyStore/EntryMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -348,96 +348,140 @@ public class EntryMethods
public static class Pre15 extends KeyStoreSpi {
- private static KeyStoreSpi jks = getJKS();
+ private static KeyStore jks = getJKS();
- // javac does not allow direct access to class (javac bug?)
- // use reflection instead
- private static KeyStoreSpi getJKS() {
+ private static KeyStore getJKS() {
try {
- Class clazz = Class.forName("sun.security.provider.JavaKeyStore$JKS");
- return (KeyStoreSpi)clazz.newInstance();
+ return (KeyStore) KeyStore.getInstance("JKS");
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
}
+ public Pre15() {
+ }
public Key engineGetKey(String alias, char[] password)
throws NoSuchAlgorithmException, UnrecoverableKeyException {
- return jks.engineGetKey(alias, password);
+ try {
+ return jks.getKey(alias, password);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public java.security.cert.Certificate[] engineGetCertificateChain
(String alias) {
- return jks.engineGetCertificateChain(alias);
+ try {
+ return jks.getCertificateChain(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public java.security.cert.Certificate engineGetCertificate
(String alias) {
- return jks.engineGetCertificate(alias);
+ try {
+ return jks.getCertificate(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public Date engineGetCreationDate(String alias) {
- return jks.engineGetCreationDate(alias);
+ try {
+ return jks.getCreationDate(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public void engineSetKeyEntry(String alias, Key key,
char[] password,
java.security.cert.Certificate[] chain)
throws KeyStoreException {
- jks.engineSetKeyEntry(alias, key, password, chain);
+ jks.setKeyEntry(alias, key, password, chain);
}
public void engineSetKeyEntry(String alias, byte[] key,
java.security.cert.Certificate[] chain)
throws KeyStoreException {
- jks.engineSetKeyEntry(alias, key, chain);
+ jks.setKeyEntry(alias, key, chain);
}
public void engineSetCertificateEntry(String alias,
java.security.cert.Certificate cert)
throws KeyStoreException {
- jks.engineSetCertificateEntry(alias, cert);
+ jks.setCertificateEntry(alias, cert);
}
public void engineDeleteEntry(String alias)
throws KeyStoreException {
- jks.engineDeleteEntry(alias);
+ jks.deleteEntry(alias);
}
public Enumeration engineAliases() {
- return jks.engineAliases();
+ try {
+ return jks.aliases();
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
+
}
public boolean engineContainsAlias(String alias) {
- return jks.engineContainsAlias(alias);
+ try {
+ return jks.containsAlias(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public int engineSize() {
- return jks.engineSize();
+ try {
+ return jks.size();
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public boolean engineIsKeyEntry(String alias) {
- return jks.engineIsKeyEntry(alias);
+ try {
+ return jks.isKeyEntry(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public boolean engineIsCertificateEntry(String alias) {
- return jks.engineIsCertificateEntry(alias);
+ try {
+ return jks.isCertificateEntry(alias);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public String engineGetCertificateAlias
(java.security.cert.Certificate cert) {
- return jks.engineGetCertificateAlias(cert);
+ try {
+ return jks.getCertificateAlias(cert);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public void engineStore(OutputStream stream, char[] password)
throws IOException, NoSuchAlgorithmException, CertificateException {
- jks.engineStore(stream, password);
+ try {
+ jks.store(stream, password);
+ } catch (KeyStoreException ke) {
+ throw new RuntimeException("Unexpected exception", ke);
+ }
}
public void engineLoad(InputStream stream, char[] password)
throws IOException, NoSuchAlgorithmException, CertificateException {
- jks.engineLoad(stream, password);
+ jks.load(stream, password);
}
}
diff --git a/jdk/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java b/jdk/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java
new file mode 100644
index 00000000000..00fef3a4bff
--- /dev/null
+++ b/jdk/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/* @test
+ * @bug 8081678
+ * @summary Tests for stream returning methods
+ * @library ../../util/stream/bootlib
+ * @build java.util.stream.OpTestCase
+ * @run testng/othervm PermissionCollectionStreamTest
+ */
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.FilePermission;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Supplier;
+import java.util.stream.OpTestCase;
+import java.util.stream.Stream;
+import java.util.stream.TestData;
+
+public class PermissionCollectionStreamTest extends OpTestCase {
+
+ @DataProvider
+ public static Object[][] permissions() {
+ return new Object[][]{
+ {
+ "FilePermission",
+ new Permission[]{
+ new FilePermission("/home/foobar", "read"),
+ new FilePermission("/home/foo", "write"),
+ new FilePermission("/home/foobar", "read,write"),
+ }
+ },
+ };
+ }
+
+
+ private PermissionCollection create(Permission[] pa) {
+ PermissionCollection pc = pa[0].newPermissionCollection();
+ for (Permission p : pa) {
+ pc.add(p);
+ }
+ return pc;
+ }
+
+ @Test(dataProvider = "permissions")
+ public void testElementsAsStream(String description, Permission[] pa) {
+ PermissionCollection pc = create(pa);
+
+ Supplier> ss = pc::elementsAsStream;
+
+ Collection expected = Collections.list(pc.elements());
+ withData(TestData.Factory.ofSupplier(description, ss))
+ .stream(s -> s)
+ .expectedResult(expected)
+ .exercise();
+ }
+}
diff --git a/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java b/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java
index 938f23e38a9..9bc312d00c3 100644
--- a/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java
+++ b/jdk/test/java/sql/testng/test/sql/DriverManagerTests.java
@@ -34,7 +34,11 @@ import java.io.PrintWriter;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Properties;
+import java.util.stream.Collectors;
+
import static org.testng.Assert.*;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -351,4 +355,24 @@ public class DriverManagerTests {
assertTrue(result.equals(reader.readLine()));
}
}
+
+ /**
+ * Register some driver implementations and validate that the driver
+ * elements covered by the Enumeration obtained from
+ * {@link DriverManager#getDrivers()} are the same as driver elements
+ * covered by the stream obtained from {@link DriverManager#drivers()}}
+ */
+ @Test
+ public void tests19() throws Exception {
+ int n = 8;
+ for (int i = 0; i < n; i++) {
+ DriverManager.registerDriver(new StubDriver());
+ }
+
+ Collection expectedDrivers = Collections.list(DriverManager.getDrivers());
+ assertEquals(expectedDrivers.size(), n);
+ Collection drivers = DriverManager.drivers().collect(Collectors.toList());
+
+ assertEquals(drivers, expectedDrivers);
+ }
}
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java
index 96d329b73c0..fa7b912d436 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java
@@ -171,7 +171,7 @@ public class DistinctOpTest extends OpTestCase {
assertSorted(result);
}
- @Test
+ @Test(groups = { "serialization-hostile" })
public void testStable() {
// Create N instances of Integer all with the same value
List input = IntStream.rangeClosed(0, 1000)
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
index 44499d021ce..7fe0006dc1b 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -190,6 +190,7 @@ public class SliceOpTest extends OpTestCase {
}
}
+ @Test(groups = { "serialization-hostile" })
public void testSkipLimitOpsWithNonSplittingSpliterator() {
class NonSplittingNotSubsizedOrderedSpliterator implements Spliterator {
Spliterator s;
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/BarProvider.java b/jdk/test/javax/accessibility/AccessibilityProvider/BarProvider.java
new file mode 100644
index 00000000000..334cec09703
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/BarProvider.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UncheckedIOException;
+import javax.accessibility.AccessibilityProvider;
+
+public final class BarProvider extends AccessibilityProvider {
+ private final String name = "BarProvider";
+
+ public String getName() {
+ return name;
+ }
+
+ public void activate() {
+ // Write to log to indicate activate was called.
+ try (PrintWriter writer = new PrintWriter("BarProvider.txt")) {
+ writer.println(" BarProvider-activated");
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+}
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/FooProvider.java b/jdk/test/javax/accessibility/AccessibilityProvider/FooProvider.java
new file mode 100644
index 00000000000..ae3896b502d
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/FooProvider.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import javax.accessibility.AccessibilityProvider;
+import java.io.UncheckedIOException;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public final class FooProvider extends AccessibilityProvider {
+
+ private final String name = "FooProvider";
+
+ public String getName() {
+ return name;
+ }
+
+ public void activate() {
+ // Write to log to indicate activate was called.
+ try (PrintWriter writer = new PrintWriter("FooProvider.txt")) {
+ writer.println("FooProvider-activated");
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+}
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/Load.java b/jdk/test/javax/accessibility/AccessibilityProvider/Load.java
new file mode 100644
index 00000000000..41fc1ff3396
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/Load.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import java.awt.AWTError;
+import java.awt.Toolkit;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import javax.accessibility.AccessibilityProvider;
+
+public class Load {
+
+ public static void main(String[] args) {
+ // args[0]: "pass" or "fail" (the expected result)
+ // args[1]: ""
+ // args[2]: ""
+
+ boolean passExpected = args[0].equals("pass");
+
+ // Fill Set with provider names that were requested.
+ // The providers may or may not be available:
+ // - available: FooProvider, BarProvider
+ // - not available: NoProvider
+ List requestedNames = new ArrayList<>();
+ for (int i = 1; i < args.length; ++i) {
+ requestedNames.add(args[i]);
+ }
+ // cleanup files from any prior run
+ for (String name : requestedNames) {
+ File f = new File(name + ".txt");
+ f.delete();
+ }
+ // Activate getDefaultToolkit which will in turn activate the providers
+ try {
+ Toolkit.getDefaultToolkit();
+ } catch (AWTError e) {
+ if (passExpected) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+ // Toolkit.getDefaultToolkit() already went through all the service
+ // providers, loading and activating the requested ones, but now we need
+ // to see if they actually got activated.
+ // Go through the providers that were requested, for each one:
+ // If it was activated pass
+ // else fail (throw exception)
+ boolean failure = false;
+ String failingName = "";
+ for (String name : requestedNames) {
+ File f = new File(name + ".txt");
+ if (!f.exists()) {
+ failure = true;
+ failingName = name;
+ break;
+ }
+ } // if get to here, no issues, so try next provider
+ if (failure && passExpected) {
+ throw new RuntimeException(failingName + " was not activated");
+ }
+ if (!failure && !passExpected) {
+ String s = "Test passed but a failure was expected. ";
+ s += "The requested providers were:\n";
+ for (String name : requestedNames) {
+ s += (" " + name + "\n");
+ }
+ throw new RuntimeException(s);
+ }
+ }
+}
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/UnusedProvider.java b/jdk/test/javax/accessibility/AccessibilityProvider/UnusedProvider.java
new file mode 100644
index 00000000000..37c01f73eaf
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/UnusedProvider.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UncheckedIOException;
+import javax.accessibility.AccessibilityProvider;
+
+public final class UnusedProvider extends AccessibilityProvider {
+
+ private static final String name = "UnusedProvider";
+
+ public String getName() {
+ return name;
+ }
+
+ public void activate() {
+ // Write to log to indicate activate was called.
+ try (PrintWriter writer = new PrintWriter("UnusedProvider.txt")) {
+ writer.println("UnusedProvider-activated");
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+}
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp b/jdk/test/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp
new file mode 100644
index 00000000000..71c05d1700f
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/accessibilityProvider.sp
@@ -0,0 +1,4 @@
+grant {
+ permission java.lang.RuntimePermission "accessibilityProvider";
+ permission java.io.FilePermission "*", "read,write,delete";
+};
diff --git a/jdk/test/javax/accessibility/AccessibilityProvider/basic.sh b/jdk/test/javax/accessibility/AccessibilityProvider/basic.sh
new file mode 100644
index 00000000000..0588d009a19
--- /dev/null
+++ b/jdk/test/javax/accessibility/AccessibilityProvider/basic.sh
@@ -0,0 +1,114 @@
+#
+# 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.
+#
+# 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.
+#
+# @test
+# @bug 8055160
+# @summary Unit test for javax.accessibility.AccessibilitySPI
+#
+# @build Load FooProvider BarProvider UnusedProvider
+# @run shell basic.sh
+
+# Command-line usage: sh basic.sh /path/to/build
+
+if [ -z "$TESTJAVA" ]; then
+ if [ $# -lt 1 ]; then exit 1; fi
+ TESTJAVA="$1"
+ TESTSRC=`pwd`
+ TESTCLASSES="`pwd`"
+fi
+
+JAVA="$TESTJAVA/bin/java"
+
+OS=`uname -s`
+case "$OS" in
+ SunOS | Darwin | AIX )
+ FS='/'
+ SEP=':' ;;
+ Linux )
+ FS='/'
+ SEP=':' ;;
+ * )
+ FS='\\'
+ SEP='\;' ;;
+esac
+
+TESTD=x.test
+rm -rf $TESTD
+mkdir -p $TESTD
+
+mv $TESTCLASSES/FooProvider.class $TESTD
+mv $TESTCLASSES/BarProvider.class $TESTD
+mv $TESTCLASSES/UnusedProvider.class $TESTD
+mkdir -p $TESTD/META-INF/services
+echo FooProvider >$TESTD/META-INF/services/javax.accessibility.AccessibilityProvider
+echo BarProvider >>$TESTD/META-INF/services/javax.accessibility.AccessibilityProvider
+echo UnusedProvider >>$TESTD/META-INF/services/javax.accessibility.AccessibilityProvider
+
+
+failures=0
+
+go() {
+ CP="$TESTCLASSES$SEP$TESTD"
+ echo ''
+ sh -xc "$JAVA $SECURITY_MANAGER -Djavax.accessibility.assistive_technologies=$PROVIDER1$COMMA$PROVIDER2 -cp $CP Load $1 $2 $3" 2>&1
+ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+}
+
+# find one provider
+PROVIDER1="FooProvider"
+go pass $PROVIDER1
+
+# start using security manager
+SECURITY_MANAGER="-Djava.security.manager -Djava.security.policy=$TESTSRC/accessibilityProvider.sp"
+
+# find one provider (with security manager)
+go pass $PROVIDER1
+SECURITY_MANAGER=
+
+# fail if no provider found
+PROVIDER1="NoProvider"
+go fail $PROVIDER1
+
+# setup for two providers
+COMMA=","
+
+# find two providers, both exist
+PROVIDER1="FooProvider"
+PROVIDER2="BarProvider"
+go pass $PROVIDER1 $PROVIDER2
+
+# find two providers, where second one doesn't exist
+PROVIDER1="FooProvider"
+PROVIDER2="NoProvider"
+go fail $PROVIDER1 $PROVIDER2
+
+# find two providers, where first one doesn't exist
+PROVIDER1="NoProvider"
+PROVIDER2="BarProvider"
+go fail $PROVIDER1 $PROVIDER2
+
+echo ''
+if [ $failures -gt 0 ];
+ then echo "$failures case(s) failed";
+ else echo "All cases passed"; fi
+exit $failures
+
diff --git a/jdk/test/javax/accessibility/TEST.properties b/jdk/test/javax/accessibility/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/javax/accessibility/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/javax/imageio/TEST.properties b/jdk/test/javax/imageio/TEST.properties
new file mode 100644
index 00000000000..31eeb72bff9
--- /dev/null
+++ b/jdk/test/javax/imageio/TEST.properties
@@ -0,0 +1 @@
+modules=java.desktop
diff --git a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
index 6f889251775..f725cd74932 100644
--- a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
+++ b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -p
#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -29,6 +29,7 @@
# the same VM and verifies that ImageIO shutdown hook
# StreamCloser does not cause a leak of classloaders.
#
+# @modules java.desktop/sun.awt
# @build test.Main
# @build testapp.Main
# @run shell run_test.sh
diff --git a/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java b/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java
index 88e61dd2e76..728ee23ffa1 100644
--- a/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java
+++ b/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java
@@ -31,7 +31,7 @@
* @modules java.management
* @run clean MLetCommand
* @run build MLetCommand
- * @run main/othervm/policy=policy MLetCommand
+ * @run main/othervm/java.security.policy=policy MLetCommand
*/
import javax.management.MBeanServer;
diff --git a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java b/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
index b8df32c621b..fd272fbe1a3 100644
--- a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
+++ b/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java
@@ -30,7 +30,7 @@
* @modules java.management
* @run clean GetAllDescriptorsTest
* @run build GetAllDescriptorsTest
- * @run main/othervm/policy=policy GetAllDescriptorsTest
+ * @run main/othervm/java.security.policy=policy GetAllDescriptorsTest
*/
import java.lang.reflect.*;
diff --git a/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java b/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
index d811ad1219a..de7fba15686 100644
--- a/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
+++ b/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java
@@ -31,7 +31,7 @@
* @modules java.management
* @run clean SimpleModelMBeanCommand
* @run build SimpleModelMBeanCommand
- * @run main/othervm/policy=policy SimpleModelMBeanCommand
+ * @run main/othervm/java.security.policy=policy SimpleModelMBeanCommand
*/
import java.lang.reflect.*;
diff --git a/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java b/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java
index 9f19efea098..3f91fc38085 100644
--- a/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java
+++ b/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java
@@ -27,6 +27,7 @@
* @summary Test that a listener can be removed remotely from an MBean that no longer exists.
* @modules java.management/com.sun.jmx.remote.internal
* @author Eamonn McManus
+ * @run main/othervm -XX:+UsePerfData DeadListenerTest
*/
import com.sun.jmx.remote.internal.ServerNotifForwarder;
diff --git a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java b/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
index 4f56e69a8de..a86b10abd26 100644
--- a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
+++ b/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
@@ -47,6 +47,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
+import java.util.Collections;
import java.util.List;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLEngine;
@@ -70,7 +71,8 @@ public class CipherTestUtils {
public static final SecureRandom secureRandom = new SecureRandom();
public static char[] PASSWORD = "passphrase".toCharArray();
private static final List TESTS = new ArrayList<>(3);
- private static final List EXCEPTIONS = new ArrayList<>(1);
+ private static final List EXCEPTIONS
+ = Collections.synchronizedList(new ArrayList<>(1));
private static final String CLIENT_PUBLIC_KEY
= "-----BEGIN CERTIFICATE-----\n"
+ "MIICtTCCAh4CCQDkYJ46DMcGRjANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC\n"
diff --git a/jdk/test/javax/print/TEST.properties b/jdk/test/javax/print/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/javax/print/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/javax/sound/TEST.properties b/jdk/test/javax/sound/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/javax/sound/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java
index 910613990fe..29c93ff5bf5 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatConverter getFormat method */
+ @summary Test AudioFloatConverter getFormat method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
import com.sun.media.sound.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
index 9e6e919af80..845ad9dd9e8 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatConverter toFloatArray method */
+ @summary Test AudioFloatConverter toFloatArray method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java
index 4f7fcf78829..fcf0d669535 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test skip method returned from AudioFloatFormatConverter.getAudioInputStream */
+ @summary Test skip method returned from AudioFloatFormatConverter.getAudioInputStream
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java
index ef19c822788..5ae9b114e73 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream available method */
+ @summary Test AudioFloatInputStream available method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java
index 96ca98ad95e..3db668bcda5 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream close method */
+ @summary Test AudioFloatInputStream close method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java
index 77af795be27..3833624bf63 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream getFormat method */
+ @summary Test AudioFloatInputStream getFormat method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java
index de5cdbbc6e8..d90fe588725 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream getFrameLength method */
+ @summary Test AudioFloatInputStream getFrameLength method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java
index b4c8aa7653f..0cb5928af85 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream markSupported method */
+ @summary Test AudioFloatInputStream markSupported method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java
index 032946aeee4..77430746fea 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream read method */
+ @summary Test AudioFloatInputStream read method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java
index caffe3ae3af..d8ab5fbaee0 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream read(float[]) method */
+ @summary Test AudioFloatInputStream read(float[]) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java
index 25bc0b3bfae..b444d6b410b 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream read(float[], int, int) method */
+ @summary Test AudioFloatInputStream read(float[], int, int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java
index df854eefbfc..078454f8911 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream reset method */
+ @summary Test AudioFloatInputStream reset method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java
index ed7a2d4dd63..d4b24661cb7 100644
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test AudioFloatInputStream skip method */
+ @summary Test AudioFloatInputStream skip method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java
index 5748cafc4e9..2502c3e1188 100644
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test DLSSoundbankReader getSoundbank(File) method */
+ @summary Test DLSSoundbankReader getSoundbank(File) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java
index 9ae76517605..3f9baaa07eb 100644
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test DLSSoundbankReader getSoundbank(InputStream) method */
+ @summary Test DLSSoundbankReader getSoundbank(InputStream) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java
index 0825e125f62..bf6a02b6f2e 100644
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,7 +23,9 @@
/* @test
@summary Test DLSSoundbankReader getSoundbank(InputStream) method using
- very bad InputStream which can only read 1 byte at time */
+ very bad InputStream which can only read 1 byte at time
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java
index c3fb5c1976e..34d5f54ddf7 100644
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test DLSSoundbankReader getSoundbank(File) method */
+ @summary Test DLSSoundbankReader getSoundbank(File) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.net.URL;
diff --git a/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java b/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java
index f83e54de0b8..71156dc3234 100644
--- a/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java
+++ b/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test EmergencySoundbank createSoundbank() method */
+ @summary Test EmergencySoundbank createSoundbank() method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java
index 6afa60b61ad..e1a39d3c500 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer getInputStream method */
+ @summary Test ModelByteBuffer getInputStream method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java
index edfa8706cce..b9928253678 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer getRoot method */
+ @summary Test ModelByteBuffer getRoot method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java
index c8d85155cff..734ed37b4ac 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer load method */
+ @summary Test ModelByteBuffer load method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java
index bcc075120ca..e912ee98698 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer loadAll method */
+ @summary Test ModelByteBuffer loadAll method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java
index 8c192be6575..edcef873e0a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer(byte[]) constructor */
+ @summary Test ModelByteBuffer(byte[]) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java
index 03dd4779e52..3d1ad726598 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer(byte[],int,int) constructor */
+ @summary Test ModelByteBuffer(byte[],int,int) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java
index a5fe1fec7d1..5a200045671 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer(File) constructor */
+ @summary Test ModelByteBuffer(File) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java
index 779c8737692..d55466ae5e8 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer(File,long,long) constructor */
+ @summary Test ModelByteBuffer(File,long,long) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java
index 3c4b21f07bc..c4da3ad8183 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream available() method */
+ @summary Test ModelByteBuffer.RandomFileInputStream available() method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java
index 9ce6077fe23..2bfd5891953 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream close method */
+ @summary Test ModelByteBuffer.RandomFileInputStream close method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java
index 3de30518690..bcd8584834e 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods */
+ @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java
index 3777778d723..e505d0b9d96 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method */
+ @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java
index 6bd5fda6865..e8fb2818fca 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream read() method */
+ @summary Test ModelByteBuffer.RandomFileInputStream read() method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java
index e7bd8d8b058..a847b56783b 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method */
+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
index 4e908d44346..c8c0a0fe64d 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method */
+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java
index f664a9a5e34..96ce0fef5e8 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method */
+ @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java
index 3164bbe2323..14eba08157e 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer subbuffer(long) method */
+ @summary Test ModelByteBuffer subbuffer(long) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java
index cc0cbf3d7c7..d6f9cd82521 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer subbuffer(long,long) method */
+ @summary Test ModelByteBuffer subbuffer(long,long) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java
index 0726f18b06f..d59349ce709 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer subbuffer(long,long,boolean) method */
+ @summary Test ModelByteBuffer subbuffer(long,long,boolean) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java
index 88e49261f8c..1c15fa3a176 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer unload method */
+ @summary Test ModelByteBuffer unload method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java
index b1522640734..61ebd221659 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBuffer writeTo method */
+ @summary Test ModelByteBuffer writeTo method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java
index 89ec6419c85..c79137ccf93 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable getAttenuation method */
+ @summary Test ModelByteBufferWavetable getAttenuation method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java
index c9024bf39f9..d0a8e485def 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable getChannels method */
+ @summary Test ModelByteBufferWavetable getChannels method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java
index 735704d0c13..19413be3db2 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable getLoopLength method */
+ @summary Test ModelByteBufferWavetable getLoopLength method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java
index a03403876a4..f659a4abf3c 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable getLoopStart method */
+ @summary Test ModelByteBufferWavetable getLoopStart method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java
index 2adf7043155..efb9930edb7 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable getPitchCorrect method */
+ @summary Test ModelByteBufferWavetable getPitchCorrect method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java
index eb24b9e306f..93d471588f0 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable(ModelByteBuffer) method */
+ @summary Test ModelByteBufferWavetable(ModelByteBuffer) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java
index 9acf07ff0ff..fe56b048b79 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat) method */
+ @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java
index 0544a130559..97e8f531491 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat) method */
+ @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java
index fb7bc3bbd3b..443e501695b 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat, float) method */
+ @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat, float) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java
index d000567a773..41314d8cb8d 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable open method */
+ @summary Test ModelByteBufferWavetable open method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java
index fb86e120b3f..01e3b7a26af 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -23,7 +23,9 @@
/* @test
@summary Test AudioFloatInputStream.getFrameLength() returned from
- ModelByteBufferWavetable openStream method */
+ ModelByteBufferWavetable openStream method
+ @modules java.desktop/com.sun.media.sound
+ */
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java
index 6775500d8d1..57e04791723 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable set8BitExtensionBuffer method */
+ @summary Test ModelByteBufferWavetable set8BitExtensionBuffer method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java
index e0ac697e4ee..eddecc41b62 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable SetLoopType method */
+ @summary Test ModelByteBufferWavetable SetLoopType method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java
index bab1621123d..0e225160f3f 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelDestination constructor */
+ @summary Test ModelDestination constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java
index 89feb84f4c3..56031904445 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelDestination(ModelIdentifier) constructor */
+ @summary Test ModelDestination(ModelIdentifier) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java
index 7641884301b..b3a57b6397a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable setIdentifier(ModelIdentifier) method */
+ @summary Test ModelByteBufferWavetable setIdentifier(ModelIdentifier) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java
index 6938cb12354..7a10e9f9e42 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelByteBufferWavetable setTransform(ModelTransform) method */
+ @summary Test ModelByteBufferWavetable setTransform(ModelTransform) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java
index 49d711a1404..305474377fc 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier equals method */
+ @summary Test ModelIdentifier equals method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java
index e1617186afe..162fe8af0b9 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier(String) constructor */
+ @summary Test ModelIdentifier(String) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java
index 763273d12e0..d48cf5f7df5 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier(String, integer) constructor */
+ @summary Test ModelIdentifier(String, integer) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java
index 373daf4c68b..cb9c1018ce9 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier(String,String) constructor */
+ @summary Test ModelIdentifier(String,String) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
index 864ea2dd440..348012f54bf 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier(String,String,int) constructor */
+ @summary Test ModelIdentifier(String,String,int) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java
index 213f1bf8a46..30beedb57ef 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier setInstance method */
+ @summary Test ModelIdentifier setInstance method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java
index 7b3cffbc956..0a8b4b131f4 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier setObject method */
+ @summary Test ModelIdentifier setObject method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java
index 3911642e661..6f48d2a35aa 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelIdentifier setVariable method */
+ @summary Test ModelIdentifier setVariable method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java
index 6ec5a48651d..d63c7c8b0e6 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer getOscillators method */
+ @summary Test ModelPerformer getOscillators method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java
index d189ef94cba..50bd0e396c6 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setConnectionBlocks method */
+ @summary Test ModelPerformer setConnectionBlocks method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java
index ab4995fa4cb..e035125ab14 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setDefaultConnectionsEnabled method */
+ @summary Test ModelPerformer setDefaultConnectionsEnabled method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java
index dd881811ea8..89d84372dbc 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setExclusiveClass method */
+ @summary Test ModelPerformer setExclusiveClass method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java
index 6a7c7bfd175..0615c135a21 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setKeyFrom method */
+ @summary Test ModelPerformer setKeyFrom method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java
index 290be0a9f39..24dcab6ac0d 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setKeyTo method */
+ @summary Test ModelPerformer setKeyTo method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java
index d324cb2295d..26dd43fa321 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setName method */
+ @summary Test ModelPerformer setName method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java
index c559a513002..0e54f08c37a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setSelfNonExclusive method */
+ @summary Test ModelPerformer setSelfNonExclusive method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java
index 112ef00ad01..39ea9ae7e51 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setVelFrom method */
+ @summary Test ModelPerformer setVelFrom method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java
index e7f085b895c..204bdb69da8 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelPerformer setVelTo method */
+ @summary Test ModelPerformer setVelTo method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java
index 6ab77c154af..359756ebb07 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource() constructor */
+ @summary Test ModelSource() constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java
index 989212fa935..d9ccf8867a5 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource(ModelIdentifier) constructor */
+ @summary Test ModelSource(ModelIdentifier) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java
index c49ed08bae3..323f8320003 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource(ModelIdentifier,boolean) constructor */
+ @summary Test ModelSource(ModelIdentifier,boolean) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java
index 058c4680176..144073375d4 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource(ModelIdentifier,boolean,boolean) constructor */
+ @summary Test ModelSource(ModelIdentifier,boolean,boolean) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java
index 022049618d0..615d238b990 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource(ModelIdentifier,boolean,boolean,int) constructor */
+ @summary Test ModelSource(ModelIdentifier,boolean,boolean,int) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java
index 4623de49f1b..1e7864fb03a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource(ModelIdentifier,ModelTransform) constructor */
+ @summary Test ModelSource(ModelIdentifier,ModelTransform) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java
index 01c1d82d24c..df16d4ed2f6 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource setIdentifier method */
+ @summary Test ModelSource setIdentifier method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java
index a9a18ff906d..2bad3ac6a56 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelSource setTransform method */
+ @summary Test ModelSource setTransform method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java
index 830f6fe2e12..89c676f4e78 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardIndexedDirector class */
+ @summary Test ModelStandardIndexedDirector class
+ @modules java.desktop/com.sun.media.sound
+*/
import java.util.ArrayList;
import java.util.List;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java
index 573d906e605..8ea7ad87d8d 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform constructor */
+ @summary Test ModelStandardTransform constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java
index 89179c2ffa5..579691b53be 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform(boolean) constructor */
+ @summary Test ModelStandardTransform(boolean) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java
index 95583727507..c9ab8c5166b 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform(boolean,boolean) constructor */
+ @summary Test ModelStandardTransform(boolean,boolean) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java
index 36a08a28933..13e5fd898fc 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform(boolean,boolean,int) constructor */
+ @summary Test ModelStandardTransform(boolean,boolean,int) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java
index 496eaeb136e..97804599edc 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform setDirection method */
+ @summary Test ModelStandardTransform setDirection method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java
index 207050c02e1..3fc1383cc5c 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform setPolarity method */
+ @summary Test ModelStandardTransform setPolarity method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java
index 5d6c7f6a2fc..a8888337c66 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform setTransform method */
+ @summary Test ModelStandardTransform setTransform method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java
index da1acbab2c1..de88436ea5a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform transform method */
+ @summary Test ModelStandardTransform transform method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.ModelStandardTransform;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java
index e70b68cba2b..89600d7a8f8 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform transform method */
+ @summary Test ModelStandardTransform transform method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.ModelStandardTransform;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java
index 667473ed24e..41185482619 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform transform method */
+ @summary Test ModelStandardTransform transform method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.ModelStandardTransform;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java
index fe15766b2b0..4c327215bca 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform transform method */
+ @summary Test ModelStandardTransform transform method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.ModelStandardTransform;
diff --git a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java
index d1fe4e6da0d..f6ccd86466a 100644
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test ModelStandardTransform transform method */
+ @summary Test ModelStandardTransform transform method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.ModelStandardTransform;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java
index 1ff0064d082..2f66a1f2fb8 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader available method */
+ @summary Test RiffReader available method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java
index da5e82019f7..ddd236a8c21 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader close method */
+ @summary Test RiffReader close method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java
index 3292b481c7b..05f075f4ab5 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader getFilePointer method */
+ @summary Test RiffReader getFilePointer method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java
index 8f4d4b5d5cc..9f24f5ab336 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader getSize method */
+ @summary Test RiffReader getSize method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java
index a8a982691ea..4594622ebff 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader hasNextChunk method */
+ @summary Test RiffReader hasNextChunk method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java
index 55055956e6b..fb9cea65b6a 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader read method */
+ @summary Test RiffReader read method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java
index 8d564eb69ec..798e6b55e0d 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader read(byte) method */
+ @summary Test RiffReader read(byte) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java
index 3532508cbe1..57407713d20 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader read(byte[], int, int) method */
+ @summary Test RiffReader read(byte[], int, int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java
index e3b8c0c6b46..27ea1e7c2a0 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readInt method */
+ @summary Test RiffReader readInt method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java
index fd1f0447050..6b6aa881d32 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readLong method */
+ @summary Test RiffReader readLong method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java
index 8c64bf0103c..9994986dc99 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readShort method */
+ @summary Test RiffReader readShort method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java
index fee666d43d7..4e48d65f65b 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readString method */
+ @summary Test RiffReader readString method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java
index 4d9bd36c099..7ca5d0617ce 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readUnsignedByte method */
+ @summary Test RiffReader readUnsignedByte method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java
index 88f4f7d7b48..e93e34a3744 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readUnsignedInt method */
+ @summary Test RiffReader readUnsignedInt method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java
index df72c3144b3..3f1492aeb77 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader readUnsignedShort method */
+ @summary Test RiffReader readUnsignedShort method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java
index 2e1afd73a19..bf09f79f884 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffReader skip method */
+ @summary Test RiffReader skip method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java
index c8be15c9b17..194af0f1211 100644
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RiffWriter(OutputStream) constructor */
+ @summary Test RiffWriter(OutputStream) constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java
index 108bb32226f..14d4c379bfb 100644
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SF2SoundbankReader getSoundbank(File) method */
+ @summary Test SF2SoundbankReader getSoundbank(File) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java
index 78624db80d5..abe45180c48 100644
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SF2SoundbankReader getSoundbank(InputStream) method */
+ @summary Test SF2SoundbankReader getSoundbank(InputStream) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java
index daa314eb13c..3e62bf3f254 100644
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,7 +23,9 @@
/* @test
@summary Test SF2SoundbankReader getSoundbank(InputStream) method using
- very bad InputStream which can only read 1 byte at time */
+ very bad InputStream which can only read 1 byte at time
+ @modules java.desktop/com.sun.media.sound
+ */
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java
index 8a49fce572c..90754a69703 100644
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SF2SoundbankReader getSoundbank(File) method */
+ @summary Test SF2SoundbankReader getSoundbank(File) method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.net.URL;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java
index 8fc359b0058..a1d3898e154 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelInstrument) method */
+ @summary Test SimpleInstrument add(ModelInstrument) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java
index a7e40a4dd91..ac1fb04ecfc 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelInstrument,int,int) method */
+ @summary Test SimpleInstrument add(ModelInstrument,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java
index dab492ee1e4..2366a9c809b 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java
index fe2c5e7500f..04f7b71650f 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java
index c27b2d41ba6..726fabb79be 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer) method */
+ @summary Test SimpleInstrument add(ModelPerformer) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java
index d8a2c543b6e..f3756ad5654 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer[]) method */
+ @summary Test SimpleInstrument add(ModelPerformer[]) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java
index c0f7b036333..b3052f47fe7 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer[],int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer[],int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java
index 850350b19ac..78733fee8a9 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java
index ef8406f82a9..b40c757c1b2 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java
index 697e7a2cb94..f03e1750447 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer,int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java
index 2b375817275..f688c146b70 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java
index 1662fcc24af..bd29c5da750 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int,int) method */
+ @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int,int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java
index e0c75969607..f627ea28a4c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument clear method */
+ @summary Test SimpleInstrument clear method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java
index 5d5ffd464c5..5a83e843673 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument setName(String) method */
+ @summary Test SimpleInstrument setName(String) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java
index acc7d0cd8bf..29f09065bc3 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleInstrument setPatch(Patch) method */
+ @summary Test SimpleInstrument setPatch(Patch) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java
index c73a294d289..1a553b2787d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank addInstrument method */
+ @summary Test SimpleSoundbank addInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java
index e80e508442d..0db4353581b 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank addResource method */
+ @summary Test SimpleSoundbank addResource method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.SoundbankResource;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java
index 7100b99cf73..2b6d047ce43 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank getInstrument method */
+ @summary Test SimpleSoundbank getInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java
index 0431a5800a0..5e8136af92b 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank removeInstrument method */
+ @summary Test SimpleSoundbank removeInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java
index bba8dd78307..15e22dd34ce 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank setDescription method */
+ @summary Test SimpleSoundbank setDescription method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java
index 67cc0e707a2..af4bcf428a5 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank setName method */
+ @summary Test SimpleSoundbank setName method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java
index 9dd099703ba..1f70d5f1931 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank setVendor method */
+ @summary Test SimpleSoundbank setVendor method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java
index 7e7d1dde935..4007a929eee 100644
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SimpleSoundbank setVersion method */
+ @summary Test SimpleSoundbank setVersion method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java
index 8b5435270bd..31d5ff849f1 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioBuffer array method */
+ @summary Test SoftAudioBuffer array method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java
index edd2cb392de..1a1bc99514c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioBuffer clear method */
+ @summary Test SoftAudioBuffer clear method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java
index d5ca82a0c08..ae11f2e2415 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioBuffer get method */
+ @summary Test SoftAudioBuffer get method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java
index 49e55e23217..b2f029916cc 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioBuffer constructor */
+ @summary Test SoftAudioBuffer constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java
index a9b9ef4ebce..a79d7a62cae 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioSynthesizer getFormat method */
+ @summary Test SoftAudioSynthesizer getFormat method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java
index b51a097c8ed..23c023f46e2 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioSynthesizer getPropertyInfo method */
+ @summary Test SoftAudioSynthesizer getPropertyInfo method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java
index 67e4a18b2d3..18bfdf91640 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioSynthesizer open method */
+ @summary Test SoftAudioSynthesizer open method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java
index 49098689253..94791807b98 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftAudioSynthesizer openStream method */
+ @summary Test SoftAudioSynthesizer openStream method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Patch;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java
index d68406bad7b..aaa5a069728 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel allNotesOff method */
+ @summary Test SoftChannel allNotesOff method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java
index e38f3af4b3d..c696fce5668 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel allSoundOff method */
+ @summary Test SoftChannel allSoundOff method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java
index 6806f100538..982ad1c1d11 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel channelPressure method */
+ @summary Test SoftChannel channelPressure method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java
index c67a4d5bdeb..517a8a1a4df 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel controller method */
+ @summary Test SoftChannel controller method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java
index 5fb7dd8f675..34e8b6fedfc 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel localControl method */
+ @summary Test SoftChannel localControl method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java
index 0026bc35eb7..3b65db25b7e 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel mono method */
+ @summary Test SoftChannel mono method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java
index 987b861c56f..e5f86d4fc6f 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel mute method */
+ @summary Test SoftChannel mute method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
index ca173b9dd8b..0330628c8b6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel noteOff method */
+ @summary Test SoftChannel noteOff method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
index a7b56567ae6..71172a049da 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel noteOff method */
+ @summary Test SoftChannel noteOff method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java
index adc256de722..d07d291e4ad 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel noteOn method */
+ @summary Test SoftChannel noteOn method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java
index b9395ed023e..e28f772c9a2 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel noteOn/noteOff overflow test */
+ @summary Test SoftChannel noteOn/noteOff overflow test
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiChannel;
import javax.sound.midi.VoiceStatus;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java
index 00412639be8..c7db9362002 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel overflow test 2 */
+ @summary Test SoftChannel overflow test 2
+ @modules java.desktop/com.sun.media.sound
+*/
import java.util.HashMap;
import java.util.Map;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java
index 472884520e1..d7e580592b0 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel omni method */
+ @summary Test SoftChannel omni method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java
index 92160c1ef25..c8d3e0207f6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel pitchBend method */
+ @summary Test SoftChannel pitchBend method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java
index 13a3ce9f441..3ff096cd6d3 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel polyPressure method */
+ @summary Test SoftChannel polyPressure method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java
index 32d3af387bb..09d55652fbe 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel program and bank change */
+ @summary Test SoftChannel program and bank change
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.IOException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java
index 784ca28cdeb..de3f67864a8 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel programChange method */
+ @summary Test SoftChannel programChange method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java
index 8c2534a3c14..63c0bc6ab40 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel resetAllControllers method */
+ @summary Test SoftChannel resetAllControllers method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java
index 9ae1c420711..0c9e5ec9b68 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftChannel solo method */
+ @summary Test SoftChannel solo method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java
index eb2b5b1663a..ffa11cfcb85 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftCubicResampler interpolate method */
+ @summary Test SoftCubicResampler interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java b/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java
index 46fdbfa9839..a65221bdc89 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftFilter processAudio method */
+ @summary Test SoftFilter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
index daff3981018..47affc40397 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLanczosResampler interpolate method */
+ @summary Test SoftLanczosResampler interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java
index c8b541e50e6..42ff36ff1b6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java
index 99bfc47c74a..90a462e285a 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java
index ba24aab5d86..da97a344bd8 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java
index c9eb7bca50e..f445d0c1531 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java
index 6672bf2606b..a57c5a77eb6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java
index be92a3d5443..401fd7af1ab 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java
index f8f22135b59..55e9c2d0212 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java
index 5a1f864ec22..3d6fb9a28ac 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLimiter processAudio method */
+ @summary Test SoftLimiter processAudio method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
index e09f0bc5bd1..1472ba49587 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLinearResampler interpolate method */
+ @summary Test SoftLinearResampler interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
index 2cb9daf51d5..1769fbb518c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLinearResampler2 interpolate method */
+ @summary Test SoftLinearResampler2 interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java b/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java
index 391921161f1..9eccc78c33f 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftLowFrequencyOscillator processControlLogic method */
+ @summary Test SoftLowFrequencyOscillator processControlLogic method
+ @modules java.desktop/com.sun.media.sound
+*/
import com.sun.media.sound.AudioSynthesizerPropertyInfo;
import com.sun.media.sound.SoftLowFrequencyOscillator;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
index ad70348c962..ee2b9286d49 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftPointResampler interpolate method */
+ @summary Test SoftPointResampler interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java b/jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java
index 6633e40d0a9..0ab37bf5339 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftProvider getDevice method */
+ @summary Test SoftProvider getDevice method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java
index 226037f6261..93f7a53aa3d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver close method */
+ @summary Test SoftReceiver close method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
index 78bfd7fc6c7..8553f8bd85c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver getMidiDevice method */
+ @summary Test SoftReceiver getMidiDevice method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Receiver;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java
index 490ff46e235..1dc2dde8477 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java
index ab7150fcdff..f9009e45ac5 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java
index d1ab8ed3f22..ec6b97e50af 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java
index 36b1b57aa68..0e0279c503a 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java
index 8f5a4c41a9a..df313a66ed4 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java
index 027f29f24e9..10ceb908bbd 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java
index c71ecc5386f..6ebaf6afffc 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java
index 310396efdaf..1dee270b619 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java
index a0651f079c1..da5afaa421e 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java
index af1bd9765b4..36296f74728 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java
index 8afcd9094da..0d871508ddf 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java
index b0393da4d99..3f365e8d4ef 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java
index 669020cd4a6..7768ed24966 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java
index 357154d59a7..f164fe7d604 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java
index 6fc3309250b..e25030749f6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java
index 417d2bff364..90ac2092a06 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftReceiver send method */
+ @summary Test SoftReceiver send method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.*;
import javax.sound.sampled.*;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java b/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
index 14d369276a0..283b64292a1 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSincResampler interpolate method */
+ @summary Test SoftSincResampler interpolate method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java
index 907b3570967..3057aaedad9 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer close method */
+ @summary Test SoftSynthesizer close method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java
index dab83605ce9..7794664359a 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getAvailableInstruments method */
+ @summary Test SoftSynthesizer getAvailableInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java
index 1671c486cee..b42eb243de7 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getAvailableInstruments method */
+ @summary Test SoftSynthesizer getAvailableInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java
index 3c19ef7551b..0e19586ef1c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getChannels method */
+ @summary Test SoftSynthesizer getChannels method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiChannel;
import javax.sound.midi.MidiDevice;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java
index 52e6226dc48..d42da740dd9 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getDefaultSoundbank method */
+ @summary Test SoftSynthesizer getDefaultSoundbank method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java
index 73a781cbef3..f7b6bbf66c8 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getDeviceInfo method */
+ @summary Test SoftSynthesizer getDeviceInfo method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java
index 947667d366a..983e74bf1e7 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getLatency method */
+ @summary Test SoftSynthesizer getLatency method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java
index b569036e304..f7ddae4094d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getLoadedInstruments method */
+ @summary Test SoftSynthesizer getLoadedInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java
index fed95a072e8..879f544089d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getLoadedInstruments method */
+ @summary Test SoftSynthesizer getLoadedInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java
index efc9cb2f3a9..6eb7e416a41 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getMaxPolyphony method */
+ @summary Test SoftSynthesizer getMaxPolyphony method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java
index dbfc954e180..3e3e58f2f35 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getMaxReceivers method */
+ @summary Test SoftSynthesizer getMaxReceivers method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java
index 7bc9d2b9bd7..fe3c12f5da2 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getMaxTransmitters method */
+ @summary Test SoftSynthesizer getMaxTransmitters method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java
index 106b01a0675..d7deb2b2b10 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getMicrosecondPosition method */
+ @summary Test SoftSynthesizer getMicrosecondPosition method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.IOException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java
index 80c83415e23..4b69ad0fd7c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getPropertyInfo method */
+ @summary Test SoftSynthesizer getPropertyInfo method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.util.HashMap;
import java.util.Map;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java
index fe5b80d3134..fa4d2827247 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getReceiver method */
+ @summary Test SoftSynthesizer getReceiver method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java
index 09544225380..af12c35c229 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getReceiver method */
+ @summary Test SoftSynthesizer getReceiver method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Receiver;
import javax.sound.midi.ShortMessage;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java
index 224b600d5c3..0dd6939cff7 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getReceivers method */
+ @summary Test SoftSynthesizer getReceivers method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java
index 22a5aa595c8..29a82e98262 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getTransmitter method */
+ @summary Test SoftSynthesizer getTransmitter method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java
index 78573552b4c..3cd517d0e5b 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getTransmitters method */
+ @summary Test SoftSynthesizer getTransmitters method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java
index d37c291647a..bc6513d579c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer getVoiceStatus method */
+ @summary Test SoftSynthesizer getVoiceStatus method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java
index 519f576e79b..d3219521d74 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer implicit open/close using getReceiver. */
+ @summary Test SoftSynthesizer implicit open/close using getReceiver.
+ @modules java.desktop/com.sun.media.sound
+*/
import java.lang.reflect.Field;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java
index 10401d37530..5475d03216c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer isOpen method */
+ @summary Test SoftSynthesizer isOpen method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java
index 9a5812c7d0f..322a0c38d84 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer isSoundbankSupported method */
+ @summary Test SoftSynthesizer isSoundbankSupported method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Instrument;
import javax.sound.midi.MidiDevice;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java
index c7eba86d07f..438cf8a94fd 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer loadAllInstruments method */
+ @summary Test SoftSynthesizer loadAllInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java
index e8f1142097e..5b2e2c9ac7a 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer loadAllInstrument method */
+ @summary Test SoftSynthesizer loadAllInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java
index f24b2358e1e..7ac498c9f40 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer loadAllInstruments method */
+ @summary Test SoftSynthesizer loadAllInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java
index 9d1a7c001ad..3ca088de0ec 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer open method */
+ @summary Test SoftSynthesizer open method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.lang.reflect.Field;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java
index 25bc740bb9b..40e07524ecb 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer openStream method */
+ @summary Test SoftSynthesizer openStream method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java
index 604e5cafa6c..30a57e69515 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer remapInstrument method */
+ @summary Test SoftSynthesizer remapInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.Instrument;
import javax.sound.midi.MidiDevice;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java
index eb1af02f547..b7ba235be2e 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test Disable/enable loading default soundbank in SoftSynthesizer */
+ @summary Test Disable/enable loading default soundbank in SoftSynthesizer
+ @modules java.desktop/com.sun.media.sound
+*/
import java.util.HashMap;
import java.util.Map;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java
index 0c9d873e090..01aa0e0bf91 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test rendering when using precise timestamps */
+ @summary Test rendering when using precise timestamps
+ @modules java.desktop/com.sun.media.sound
+*/
import java.util.Arrays;
import java.util.Random;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java
index 83663152b01..2086cc7e30d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer simple note rendering in many settings */
+ @summary Test SoftSynthesizer simple note rendering in many settings
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.File;
import java.io.FileInputStream;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java
index a9557999bd0..3c1e0b2835d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer unloadAllInstruments method */
+ @summary Test SoftSynthesizer unloadAllInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java
index fce6243e3a8..1ddb3e3ca2c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer unloadInstrument method */
+ @summary Test SoftSynthesizer unloadInstrument method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java
index 825ea0a1b78..12a91b26e16 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftSynthesizer unloadInstruments method */
+ @summary Test SoftSynthesizer unloadInstruments method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiUnavailableException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java
index 192d8b766d0..4da15ec46b6 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning getName method */
+ @summary Test SoftTuning getName method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java
index 0ffeb0396ec..16e8aa6f657 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning getTuning method */
+ @summary Test SoftTuning getTuning method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java
index 7d1ae34004a..b2ebc554d7c 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning getTuning(int) method */
+ @summary Test SoftTuning getTuning(int) method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java
index 2d045e55ffd..50c04ede10d 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.UnsupportedEncodingException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java
index 7eef7a3562f..25807a34aa0 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java
index c0237ee9842..bd1134b36c4 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.UnsupportedEncodingException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java
index 2a14a52a1a2..df9397b5d71 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.UnsupportedEncodingException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java
index a7986bb1bba..2a7cc0f6580 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.UnsupportedEncodingException;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java
index ba17ed69a72..8d62d4b42f2 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java
index 12dfe1de1da..86634f45794 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java
index 49fbb957aec..e7d98b25c6e 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning load method */
+ @summary Test SoftTuning load method
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java
index 1d93e52606c..7125ebd5e80 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning constructor */
+ @summary Test SoftTuning constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java
index f0b7a2bbb4e..ad60c56af94 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning constructor */
+ @summary Test SoftTuning constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java
index d826d7d1254..7dd176301fc 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning constructor */
+ @summary Test SoftTuning constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java
index d9a50e7c8d9..8db7b697fd1 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test SoftTuning constructor */
+ @summary Test SoftTuning constructor
+ @modules java.desktop/com.sun.media.sound
+*/
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Patch;
diff --git a/jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java b/jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java
index 357ced1bdbd..6fc40a7827b 100644
--- a/jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java
+++ b/jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
*/
/* @test
- @summary Test RealTime-tunings using SoftReciver.send method */
+ @summary Test RealTime-tunings using SoftReciver.send method
+ @modules java.desktop/com.sun.media.sound
+*/
import java.io.IOException;
diff --git a/jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java b/jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java
index 0b290375f45..801355ecbac 100644
--- a/jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java
+++ b/jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
@bug 6456844
@summary Tests that JTextComponent doesn't create drop locations with null bias.
@author Shannon Hickey
+ @modules java.desktop/sun.swing
*/
import sun.swing.SwingAccessor;
diff --git a/jdk/test/javax/swing/JButton/4796987/bug4796987.java b/jdk/test/javax/swing/JButton/4796987/bug4796987.java
index a206ff7b931..52d2a32120f 100644
--- a/jdk/test/javax/swing/JButton/4796987/bug4796987.java
+++ b/jdk/test/javax/swing/JButton/4796987/bug4796987.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,6 +28,8 @@
* @author Alexander Scherbatiy
* @library ../../regtesthelpers
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * java.desktop/sun.awt
* @build jdk.testlibrary.OSInfo
* @build Util
* @run main bug4796987
diff --git a/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java b/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java
index c55287906bc..292f001e543 100644
--- a/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java
+++ b/jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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 @@
* @summary Tests that checkbox and radiobuttons' check marks are visible when background is black
* @author Ilya Boyandin
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
* @build jdk.testlibrary.OSInfo
* @run applet/manual=yesno bug4449413.html
*/
diff --git a/jdk/test/javax/swing/JColorChooser/Test6524757.java b/jdk/test/javax/swing/JColorChooser/Test6524757.java
index 779ef7ba88d..55ee7c4e4c8 100644
--- a/jdk/test/javax/swing/JColorChooser/Test6524757.java
+++ b/jdk/test/javax/swing/JColorChooser/Test6524757.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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 @@
* @bug 6524757
* @summary Tests different locales
* @author Sergey Malenkov
+ * @modules java.desktop/sun.swing
*/
import java.awt.Component;
diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
index 83392bae45b..6293a3edb42 100644
--- a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
+++ b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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 @@
@summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
@author Vladislav Karnaukhov
@library ../../../../lib/testlibrary
+ @modules java.desktop/com.sun.java.swing.plaf.windows
@build jdk.testlibrary.OSInfo
@run main bug4199622
*/
diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
index 37a8c0d6404..48b3a40d6b2 100644
--- a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
+++ b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,6 @@ import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JTextField;
import javax.swing.UIManager;
-import sun.awt.SunToolkit;
import static javax.swing.SwingUtilities.invokeAndWait;
import static javax.swing.SwingUtilities.windowForComponent;
@@ -42,6 +41,7 @@ import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
* @summary Tests that editable combobox select all text
* @author Sergey Malenkov
* @library ../../../../lib/testlibrary/
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
* @build ExtendedRobot
* @run main Test8015300
*/
diff --git a/jdk/test/javax/swing/JComponent/6683775/bug6683775.java b/jdk/test/javax/swing/JComponent/6683775/bug6683775.java
index 190d0463e21..ba627d183af 100644
--- a/jdk/test/javax/swing/JComponent/6683775/bug6683775.java
+++ b/jdk/test/javax/swing/JComponent/6683775/bug6683775.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
@bug 6683775 6794764
@summary Painting artifacts is seen when panel is made setOpaque(false) for a translucent window
@author Alexander Potochkin
+ @modules java.desktop/com.sun.awt
+ java.desktop/sun.awt
@run main bug6683775
*/
diff --git a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
index b4fc89f0552..1fd6c443c11 100644
--- a/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
+++ b/jdk/test/javax/swing/JComponent/8043610/bug8043610.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -28,6 +28,7 @@
@summary Tests that JComponent invalidate, revalidate and repaint methods could
be called from any thread
@author Petr Pchelko
+ @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/JEditorPane/bug4714674.java b/jdk/test/javax/swing/JEditorPane/bug4714674.java
index f42d8fab8be..85f511d0850 100644
--- a/jdk/test/javax/swing/JEditorPane/bug4714674.java
+++ b/jdk/test/javax/swing/JEditorPane/bug4714674.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,8 @@
@bug 4714674
@summary Tests that JEditorPane opens HTTP connection asynchronously
@author Peter Zhelezniakov
+ @modules java.desktop
+ jdk.httpserver
@run main bug4714674
*/
diff --git a/jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java b/jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java
index 8a9af80b672..33012922cab 100644
--- a/jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java
+++ b/jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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,8 @@
* @bug 4847375
* @summary JFileChooser Create New Folder button is disabled incorrectly
* @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
+ * java.desktop/sun.awt.shell
*/
import sun.awt.OSInfo;
diff --git a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
index a4df9535d97..977c85e030a 100644
--- a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
+++ b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -27,6 +27,7 @@
* @summary Tests memory leak for 20000 files
* @author Sergey Malenkov
* @library ../../regtesthelpers
+ * @modules java.desktop/sun.java2d
* @build Util
* @run main/othervm/timeout=1000 -mx128m TwentyThousandTest
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java b/jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java
index 695a04d9396..c16b0edd3b6 100644
--- a/jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java
+++ b/jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
@bug 6550546
@summary Win LAF: JFileChooser -> Look in Drop down should not display any shortcuts created on desktop
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
+ java.desktop/sun.awt.shell
@run main bug6550546
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
index 6ec2e4fffcc..fbf92473dc6 100644
--- a/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
+++ b/jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
@bug 6713352
@summary Deadlock in JFileChooser with synchronized custom FileSystemView
@author Pavel Porvatov
+ @modules java.desktop/sun.awt.shell
@run main bug6713352
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java b/jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java
index 078e310c965..89d08c88d5b 100644
--- a/jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java
+++ b/jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
@bug 6741890
@summary Deadlock in Win32ShellFolderManager2
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
+ java.desktop/sun.awt.shell
@run main bug6741890
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java b/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java
index a43ba18d9e4..2c32f5f2b5e 100644
--- a/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java
+++ b/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
@bug 6798062
@summary Memory Leak on using getFiles of FileSystemView
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
+ java.desktop/sun.awt.shell
@run applet/manual=done bug6798062.html
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java b/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
index 2b65f173a18..b142fefd053 100644
--- a/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
+++ b/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,8 @@
* @bug 6817933
* @summary Tests that HTMLEditorKit does not affect JFileChooser
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
+ * java.desktop/sun.swing
*/
import java.awt.Color;
diff --git a/jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java b/jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java
index 7c5b9d8d06e..16bfcf17007 100644
--- a/jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java
+++ b/jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
@summary JFileChooser lacks icons on top right when running on Windows 7
@author Pavel Porvatov
@library ../../../../lib/testlibrary
+ @modules java.desktop/sun.awt.shell
@build jdk.testlibrary.OSInfo
@run main bug6840086
*/
diff --git a/jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java b/jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java
index eec057298a7..29b56c078bc 100644
--- a/jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java
+++ b/jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,8 @@
@bug 6945316
@summary The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
+ java.desktop/sun.awt.shell
@run main bug6945316
*/
diff --git a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
index f900d052725..deed68deb17 100644
--- a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
+++ b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,6 +27,7 @@
* @summary JFileChooser hangs if displayed in Windows L&F
* @author Alexey Ivanov
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
* @build jdk.testlibrary.OSInfo
* @run main/othervm/timeout=10 bug8046391
*/
diff --git a/jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java b/jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java
index cf00665d61f..ab4cce31010 100644
--- a/jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java
+++ b/jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -38,6 +38,7 @@ import javax.swing.filechooser.FileSystemView;
* @bug 8062561
* @summary File system view returns null default directory
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
* @build jdk.testlibrary.OSInfo
* @run main/othervm bug8062561 GENERATE_POLICY
* @run main/othervm/policy=security.policy bug8062561 CHECK_DEFAULT_DIR run
diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
index 6fb9b655b77..b121e1d8a5d 100644
--- a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
+++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -27,6 +27,7 @@
* can be localized during run-time
* @author Mikhail Lapshin
* @library ../../../../lib/testlibrary/
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
* @build ExtendedRobot
* @run main bug6725409
*/
diff --git a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
index 63464b2738a..12fcf81471f 100644
--- a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
+++ b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
@bug 7004134
@summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
index f8f79310e28..ff68cf62844 100644
--- a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
+++ b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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,6 +28,7 @@
interaction with GNOME is not crippled
* @author Sergey Malenkov
* @library ../..
+ * @modules java.desktop/sun.awt
*/
import sun.awt.AppContext;
diff --git a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
index 1cacce868bf..ed8ec4782be 100644
--- a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
+++ b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,6 +28,7 @@
* @author Peter Zhelezniakov
* @library ../../regtesthelpers
* @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
* @build jdk.testlibrary.OSInfo
* @build Util
* @run main bug6827786
diff --git a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
index 6bddc2aefcb..d6d818dd0f3 100644
--- a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
+++ b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -34,6 +34,8 @@ import java.util.concurrent.Callable;
@summary Version 7 doesn't support translucent popup menus against a translucent window
@library ../../regtesthelpers
@author Pavel Porvatov
+ @modules java.desktop/com.sun.awt
+ java.desktop/sun.awt
*/
public class bug7156657 {
private static JFrame lowerFrame;
diff --git a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
index 43de6ac5aa9..f819d247d96 100644
--- a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
+++ b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,7 @@
* @bug 6524424
* @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings
* @author Pavel Porvatov
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
* @run applet/manual=done bug6524424.html
*/
diff --git a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
index 5f73173df34..5fd35ac36d7 100644
--- a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
+++ b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -21,9 +21,7 @@
* questions.
*/
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.Robot;
+import java.awt.*;
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import javax.swing.JFrame;
@@ -119,6 +117,20 @@ public class Test8007563 implements Runnable {
}
}
- invokeLater(this);
+ SecondaryLoop secondaryLoop =
+ Toolkit.getDefaultToolkit().getSystemEventQueue()
+ .createSecondaryLoop();
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ }
+ secondaryLoop.exit();
+ invokeLater(Test8007563.this);
+ }
+ }.start();
+ secondaryLoop.enter();
}
}
diff --git a/jdk/test/javax/swing/JTable/6788484/bug6788484.java b/jdk/test/javax/swing/JTable/6788484/bug6788484.java
index 8add60fb732..2842bad10d8 100644
--- a/jdk/test/javax/swing/JTable/6788484/bug6788484.java
+++ b/jdk/test/javax/swing/JTable/6788484/bug6788484.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -24,6 +24,7 @@
/* @test
@bug 6788484
@summary NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table
+ @modules java.desktop/sun.swing.table
@compile -XDignore.symbol.file=true bug6788484.java
@author Alexander Potochkin
@run main bug6788484
diff --git a/jdk/test/javax/swing/JTable/6937798/bug6937798.java b/jdk/test/javax/swing/JTable/6937798/bug6937798.java
index 6e063d50dd6..c34d3a89143 100644
--- a/jdk/test/javax/swing/JTable/6937798/bug6937798.java
+++ b/jdk/test/javax/swing/JTable/6937798/bug6937798.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
@bug 6937798
@summary Nimbus: Issues with JTable grid
@author Alexander Potochkin
+ @modules java.desktop/com.sun.java.swing.plaf.nimbus
@run main bug6937798
*/
diff --git a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
index 3e1fe84c1d5..cf5e291d0ef 100644
--- a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
+++ b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
@@ -35,8 +35,6 @@ import javax.swing.table.TableColumn;
import java.awt.*;
import java.awt.event.InputEvent;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
-
public class bug6884066 {
private static JTableHeader header;
diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
index ae2251ced5e..12b618bd64d 100644
--- a/jdk/test/javax/swing/JTree/8004298/bug8004298.java
+++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
* @summary NPE in WindowsTreeUI.ensureRowsAreVisible
* @author Alexander Scherbatiy
* @library ../../regtesthelpers
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
* @build Util
* @run main bug8004298
*/
diff --git a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
index 2b9856f7272..33f48a26ae2 100644
--- a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
+++ b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
@@ -32,7 +32,6 @@ import javax.swing.JFrame;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
-import sun.awt.SunToolkit;
import static java.awt.event.InputEvent.CTRL_DOWN_MASK;
import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW;
diff --git a/jdk/test/javax/swing/Security/6657138/bug6657138.java b/jdk/test/javax/swing/Security/6657138/bug6657138.java
index fa96f6bd971..a53b339d272 100644
--- a/jdk/test/javax/swing/Security/6657138/bug6657138.java
+++ b/jdk/test/javax/swing/Security/6657138/bug6657138.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657138
* @summary Verifies that buttons and labels don't share their ui's across appContexts
* @author Alexander Potochkin
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/Security/6938813/bug6938813.java b/jdk/test/javax/swing/Security/6938813/bug6938813.java
index 5bedf95e140..ba71ec990b1 100644
--- a/jdk/test/javax/swing/Security/6938813/bug6938813.java
+++ b/jdk/test/javax/swing/Security/6938813/bug6938813.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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 @@
* @bug 6938813
* @summary Swing mutable statics
* @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.AppContext;
diff --git a/jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java b/jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java
index a58608080c6..202c9a9120f 100644
--- a/jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java
+++ b/jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -36,6 +36,7 @@ import javax.imageio.ImageIO;
* @test
* @bug 8032219
* @author Sergey Bylokhov
+ * @modules java.desktop/sun.swing
*/
public final class DrawRect {
@@ -121,4 +122,4 @@ public final class DrawRect {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/jdk/test/javax/swing/TEST.properties b/jdk/test/javax/swing/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/javax/swing/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
index 143503861a1..f7bae5b269d 100644
--- a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
+++ b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -25,6 +25,7 @@
@bug 7123767
@summary Wrong tooltip location in Multi-Monitor configurations
@author Vladislav Karnaukhov
+ @modules java.desktop/sun.awt
@run main bug7123767
*/
diff --git a/jdk/test/javax/swing/ToolTipManager/Test6657026.java b/jdk/test/javax/swing/ToolTipManager/Test6657026.java
index 2b43840a5ac..0678d57f768 100644
--- a/jdk/test/javax/swing/ToolTipManager/Test6657026.java
+++ b/jdk/test/javax/swing/ToolTipManager/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026
* @summary Tests shared ToolTipManager in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/UIDefaults/6795356/TableTest.java b/jdk/test/javax/swing/UIDefaults/6795356/TableTest.java
index 9ce70958df5..6702f803aa3 100644
--- a/jdk/test/javax/swing/UIDefaults/6795356/TableTest.java
+++ b/jdk/test/javax/swing/UIDefaults/6795356/TableTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6795356
* @summary Checks that SwingLazyValue class correclty works
* @author Alexander Potochkin
+ * @modules java.desktop/sun.applet
* @run main/othervm TableTest
*/
diff --git a/jdk/test/javax/swing/UIManager/Test6657026.java b/jdk/test/javax/swing/UIManager/Test6657026.java
index 274e93de77b..5ce1ea73de4 100644
--- a/jdk/test/javax/swing/UIManager/Test6657026.java
+++ b/jdk/test/javax/swing/UIManager/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026
* @summary Tests shared UIManager in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/border/Test4856008.java b/jdk/test/javax/swing/border/Test4856008.java
index 7c0da08e930..398fefb51a1 100644
--- a/jdk/test/javax/swing/border/Test4856008.java
+++ b/jdk/test/javax/swing/border/Test4856008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 4856008 7025987
* @summary Tests border insets
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.java.swing.plaf.motif
+ * java.desktop/com.sun.java.swing.plaf.windows
+ * java.desktop/sun.swing.plaf.synth
*/
import com.sun.java.swing.plaf.motif.MotifBorders;
diff --git a/jdk/test/javax/swing/border/Test6978482.java b/jdk/test/javax/swing/border/Test6978482.java
index 804970f2210..b9f30e531e0 100644
--- a/jdk/test/javax/swing/border/Test6978482.java
+++ b/jdk/test/javax/swing/border/Test6978482.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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,9 @@
* @bug 6978482 7025987
* @summary Tests unchecked casts
* @author Sergey Malenkov
+ * @modules java.desktop/com.sun.java.swing.plaf.motif
+ * java.desktop/com.sun.java.swing.plaf.windows
+ * java.desktop/sun.swing.plaf.synth
*/
import com.sun.java.swing.plaf.motif.MotifBorders;
diff --git a/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java b/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java
index 179f62e9003..343375d2486 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026
* @summary Tests shared BasicSplitPaneUI in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java b/jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java
index 23808de286e..d333ed3465a 100644
--- a/jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java
+++ b/jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026
* @summary Tests shared MetalBumps in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java b/jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java
index e62bf042195..158c743375c 100644
--- a/jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java
+++ b/jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026
* @summary Tests shared MetalInternalFrameUI in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java b/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java
index 924999e46f8..b8ea5e2bd07 100644
--- a/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java
+++ b/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6657026 7077259
* @summary Tests shared MetalSliderUI in different application contexts
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
* @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel Test6657026
*/
diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6741426.java b/jdk/test/javax/swing/plaf/nimbus/Test6741426.java
index 66c11b363a5..99a3ce4d463 100644
--- a/jdk/test/javax/swing/plaf/nimbus/Test6741426.java
+++ b/jdk/test/javax/swing/plaf/nimbus/Test6741426.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,7 @@
@bug 6741426
@summary Tests reusing Nimbus borders across different components (JComboBox border set on a JTextField)
@author Peter Zhelezniakov
+ @modules java.desktop/com.sun.java.swing.plaf.nimbus
@run main Test6741426
*/
diff --git a/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java b/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java
index a4f81fd031e..be1b983b195 100644
--- a/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java
+++ b/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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 @@
* @bug 7143614
* @summary Issues with Synth Look&Feel
* @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/plaf/synth/Test6660049.java b/jdk/test/javax/swing/plaf/synth/Test6660049.java
index 41d0c9cf78d..234452d0cda 100644
--- a/jdk/test/javax/swing/plaf/synth/Test6660049.java
+++ b/jdk/test/javax/swing/plaf/synth/Test6660049.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6660049 6849518
* @summary Tests the Region initialization
* @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/system/6799345/TestShutdown.java b/jdk/test/javax/swing/system/6799345/TestShutdown.java
index 9a858f1f5bd..8af07bdf2bc 100644
--- a/jdk/test/javax/swing/system/6799345/TestShutdown.java
+++ b/jdk/test/javax/swing/system/6799345/TestShutdown.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
@summary Tests that no exceptions are thrown from TimerQueue and
SwingWorker on AppContext shutdown
@author art
+ @modules java.desktop/sun.awt
@run main TestShutdown
*/
diff --git a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
index 15619c9909f..9f38cd11828 100644
--- a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
+++ b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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 @@
* @bug 6636983
* @summary test that composed text at the line starts is handled correctly
* @author Sergey Groznyh
+ * @modules java.desktop/sun.swing
* @run main bug6636983
*/
diff --git a/jdk/test/javax/swing/text/LayoutQueue/Test6588003.java b/jdk/test/javax/swing/text/LayoutQueue/Test6588003.java
index 4a7a6b28d37..561ac594a47 100644
--- a/jdk/test/javax/swing/text/LayoutQueue/Test6588003.java
+++ b/jdk/test/javax/swing/text/LayoutQueue/Test6588003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,7 @@
@bug 6588003
@summary LayoutQueue should not share its DefaultQueue across AppContexts
@author Peter Zhelezniakov
+ @modules java.desktop/sun.awt
@run main Test6588003
*/
diff --git a/jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java b/jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
index 60378e23b2f..b939f3e148f 100644
--- a/jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
+++ b/jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
@bug 6990651
@summary Regression: NPE when refreshing applet since 6u22-b01
@author Pavel Porvatov
+ @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/javax/swing/text/html/parser/Test8017492.java b/jdk/test/javax/swing/text/html/parser/Test8017492.java
index e129a41f296..43b8ec2f900 100644
--- a/jdk/test/javax/swing/text/html/parser/Test8017492.java
+++ b/jdk/test/javax/swing/text/html/parser/Test8017492.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,6 +32,7 @@ import sun.awt.SunToolkit;
/*
* @test
* @bug 8017492
+ * @modules java.desktop/sun.awt
* @run main/othervm Test8017492
* @summary Tests for OutOfMemoryError/NegativeArraySizeException
* @author Sergey Malenkov
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
index 207d18099b6..bcf829254a0 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
@@ -278,16 +278,46 @@ public final class ProcessTools {
}
/**
- * Create ProcessBuilder using the java launcher from the jdk to be tested
- * and with any platform specific arguments prepended
+ * Create ProcessBuilder using the java launcher from the jdk to be tested,
+ * and with any platform specific arguments prepended.
+ *
+ * @param command Arguments to pass to the java command.
+ * @return The ProcessBuilder instance representing the java command.
*/
public static ProcessBuilder createJavaProcessBuilder(String... command)
throws Exception {
+ return createJavaProcessBuilder(false, command);
+ }
+
+ /**
+ * Create ProcessBuilder using the java launcher from the jdk to be tested,
+ * and with any platform specific arguments prepended.
+ *
+ * @param addTestVmAndJavaOptions If true, adds test.vm.opts and test.java.opts
+ * to the java arguments.
+ * @param command Arguments to pass to the java command.
+ * @return The ProcessBuilder instance representing the java command.
+ */
+ public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
String javapath = JDKToolFinder.getJDKTool("java");
ArrayList args = new ArrayList<>();
args.add(javapath);
Collections.addAll(args, getPlatformSpecificVMArgs());
+
+ if (addTestVmAndJavaOptions) {
+ // -cp is needed to make sure the same classpath is used whether the test is
+ // run in AgentVM mode or OtherVM mode. It was added to the hotspot version
+ // of this API as part of 8077608. However, for the jdk version it is only
+ // added when addTestVmAndJavaOptions is true in order to minimize
+ // disruption to existing JDK tests, which have yet to be tested with -cp
+ // being added. At some point -cp should always be added to be consistent
+ // with what the hotspot version does.
+ args.add("-cp");
+ args.add(System.getProperty("java.class.path"));
+ Collections.addAll(args, Utils.getTestJavaOpts());
+ }
+
Collections.addAll(args, command);
// Reporting
diff --git a/jdk/test/sun/awt/AppContext/8012933/Test8012933.java b/jdk/test/sun/awt/AppContext/8012933/Test8012933.java
index 445407be430..51c5250f3ac 100644
--- a/jdk/test/sun/awt/AppContext/8012933/Test8012933.java
+++ b/jdk/test/sun/awt/AppContext/8012933/Test8012933.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
* @summary Tests (although somewhat indirectly) that createNewAppContext()
* immediately followed by dispose() works correctly
* @author Leonid Romanov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.SunToolkit;
diff --git a/jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java b/jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java
index 4939cae15ca..c4812ea39ba 100644
--- a/jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java
+++ b/jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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 @@
* @bug 8019623
* @summary Tests that AppContext.getAppContext() works correctly in multi-threads scenario.
* @author Leonid Romanov
+ * @modules java.desktop/sun.awt
*/
import sun.awt.AppContext;
diff --git a/jdk/test/sun/awt/TEST.properties b/jdk/test/sun/awt/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/sun/awt/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java b/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java
index 18ff2fc14ab..d898a953350 100644
--- a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java
+++ b/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,10 +25,10 @@
@bug 7173464
@summary Clipboard.getAvailableDataFlavors: Comparison method violates contract
@author Petr Pchelko
+ @modules java.datatransfer/sun.datatransfer
@run main DataFlavorComparatorTest
*/
-import sun.awt.datatransfer.DataTransferer;
import java.util.Comparator;
import sun.datatransfer.DataFlavorUtil;
import java.awt.datatransfer.DataFlavor;
diff --git a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java b/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java
index 86ecd481322..50f5ad68189 100644
--- a/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java
+++ b/jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
@summary "Comparison method violates its general contract" when using Clipboard
Ensure that DataFlavorComparator conforms to Comparator contract
@author Anton Nashatyrev
+ @modules java.datatransfer/sun.datatransfer
@run main DataFlavorComparatorTest1
*/
import sun.datatransfer.DataFlavorUtil;
diff --git a/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java
index 6578808d8dd..7546c36e63e 100644
--- a/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java
+++ b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,8 @@
@bug 6877495
@summary JTextField and JTextArea does not support supplementary characters
@author Alexander Scherbatiy
+ @modules java.datatransfer/sun.datatransfer
+ java.desktop/sun.awt.datatransfer
@run main SuplementaryCharactersTransferTest
*/
diff --git a/jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java b/jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java
index cae43d6a835..60f6cccd864 100644
--- a/jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java
+++ b/jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -50,6 +50,7 @@ import sun.awt.ConstrainableGraphics;
* @bug 6335200 6419610
* @summary Tests that we don't render anything if specific empty clip is set
* @author Dmitri.Trembovetski@Sun.COM: area=Graphics
+ * @modules java.desktop/sun.awt
* @run main EmptyClipRenderingTest
* @run main/othervm -Dsun.java2d.noddraw=true EmptyClipRenderingTest
* @run main/othervm -Dsun.java2d.pmoffscreen=true EmptyClipRenderingTest
diff --git a/jdk/test/sun/java2d/TEST.properties b/jdk/test/sun/java2d/TEST.properties
new file mode 100644
index 00000000000..3032a5cf793
--- /dev/null
+++ b/jdk/test/sun/java2d/TEST.properties
@@ -0,0 +1,2 @@
+modules=java.desktop
+
diff --git a/jdk/test/sun/java2d/pipe/RegionOps.java b/jdk/test/sun/java2d/pipe/RegionOps.java
index 418b73f3515..15da674a217 100644
--- a/jdk/test/sun/java2d/pipe/RegionOps.java
+++ b/jdk/test/sun/java2d/pipe/RegionOps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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 @@
* @bug 6504874
* @summary This test verifies the operation (and performance) of the
* various CAG operations on the internal Region class.
+ * @modules java.desktop/sun.java2d.pipe
* @run main RegionOps
*/
diff --git a/jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java b/jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java
index ca8fbdf5ec6..b5d813fbf3f 100644
--- a/jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java
+++ b/jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,9 @@
* @bug 6635805 6653780 6667607
* @summary Tests that the resource sharing layer API is not broken
* @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d
+ * java.desktop/sun.java2d.pipe
+ * java.desktop/sun.java2d.pipe.hw
* @compile -XDignore.symbol.file=true RSLAPITest.java
* @run main/othervm RSLAPITest
* @run main/othervm -Dsun.java2d.noddraw=true RSLAPITest
diff --git a/jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java b/jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java
index 13ae7474508..b7b44eb1adf 100644
--- a/jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java
+++ b/jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,9 @@
* @bug 6764257
* @summary Tests that the color is reset properly after save/restore context
* @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d
+ * java.desktop/sun.java2d.pipe
+ * java.desktop/sun.java2d.pipe.hw
* @compile -XDignore.symbol.file=true RSLContextInvalidationTest.java
* @run main/othervm RSLContextInvalidationTest
* @run main/othervm -Dsun.java2d.noddraw=true RSLContextInvalidationTest
diff --git a/jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java b/jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java
index a8a9a1a473a..b772735954d 100644
--- a/jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java
+++ b/jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,7 @@
* @bug 6678218 6681745 6691737
* @summary Tests that v-synced BufferStrategies works (if vsync is supported)
* @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d.pipe.hw
* @compile -XDignore.symbol.file=true VSyncedBufferStrategyTest.java
* @run main/manual/othervm VSyncedBufferStrategyTest
* @run main/manual/othervm -Dsun.java2d.opengl=True VSyncedBufferStrategyTest
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
index 15843654d30..a34424935f0 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
@@ -21,14 +21,15 @@
* questions.
*/
-import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+
/**
* @test
* @library /lib/testlibrary
@@ -39,14 +40,10 @@ import java.util.concurrent.atomic.AtomicReference;
* both agent properties and jvmstat buffer.
* @modules java.management/sun.management
* @build jdk.testlibrary.* TestManager TestApplication
- * @run main/othervm/timeout=300 -XX:+UsePerfData LocalManagementTest
+ * @run main/othervm/timeout=300 LocalManagementTest
*/
-
-import jdk.testlibrary.ProcessTools;
-
public class LocalManagementTest {
private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
- private static final String TEST_JDK = System.getProperty("test.jdk");
public static void main(String[] args) throws Exception {
int failures = 0;
@@ -96,6 +93,8 @@ public class LocalManagementTest {
private static boolean doTest(String testId, String arg) throws Exception {
List args = new ArrayList<>();
+ args.add("-XX:+UsePerfData");
+ args.addAll(Utils.getVmOptions());
args.add("-cp");
args.add(TEST_CLASSPATH);
diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
index 6ef71f75d0e..ca988cdea47 100644
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
@@ -21,6 +21,7 @@
* questions.
*/
+import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -36,7 +37,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,6 +45,7 @@ import javax.management.remote.*;
import javax.net.ssl.SSLHandshakeException;
import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
import sun.management.Agent;
import sun.management.AgentConfigurationError;
@@ -155,7 +156,28 @@ public class JMXStartStopTest {
}
private static void testConnect(int port, int rmiPort) throws Exception {
+ EOFException lastException = null;
+ // factor adjusted timeout (5 seconds) for the RMI to become available
+ long timeout = System.currentTimeMillis() + Utils.adjustTimeout(5000);
+ do {
+ try {
+ doTestConnect(port, rmiPort);
+ lastException = null;
+ } catch (EOFException e) {
+ lastException = e;
+ System.out.println("Error establishing RMI connection. Retrying in 500ms.");
+ Thread.sleep(500);
+ }
+ } while (lastException != null && System.currentTimeMillis() < timeout);
+ if (lastException != null) {
+ // didn't manage to get the RMI running in time
+ // rethrow the exception
+ throw lastException;
+ }
+ }
+
+ private static void doTestConnect(int port, int rmiPort) throws Exception {
dbg_print("RmiRegistry lookup...");
dbg_print("Using port: " + port);
diff --git a/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java b/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
index f273cd2ce4b..d2f231cdfc0 100644
--- a/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
+++ b/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
@@ -196,7 +196,9 @@ final class ManagementAgentJcmd {
l.addToolArg(cmd);
}
- StringBuilder output = new StringBuilder();
+ // this buffer will get filled in different threads
+ // -> must be the synchronized StringBuffer
+ StringBuffer output = new StringBuffer();
AtomicBoolean portUnavailable = new AtomicBoolean(false);
Process p = ProcessTools.startProcess(
diff --git a/jdk/test/sun/pisces/TEST.properties b/jdk/test/sun/pisces/TEST.properties
new file mode 100644
index 00000000000..31eeb72bff9
--- /dev/null
+++ b/jdk/test/sun/pisces/TEST.properties
@@ -0,0 +1 @@
+modules=java.desktop
diff --git a/jdk/test/sun/security/krb5/auto/AcceptPermissions.java b/jdk/test/sun/security/krb5/auto/AcceptPermissions.java
index e63a06cba0e..d26f9688a6b 100644
--- a/jdk/test/sun/security/krb5/auto/AcceptPermissions.java
+++ b/jdk/test/sun/security/krb5/auto/AcceptPermissions.java
@@ -25,14 +25,6 @@
* @test
* @bug 9999999
* @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file AcceptPermissions.java
* @run main/othervm AcceptPermissions two
* @run main/othervm AcceptPermissions unbound
diff --git a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java
index cbff85de802..f5e122d030e 100644
--- a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java
+++ b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java
@@ -25,14 +25,6 @@
* @test
* @bug 7077646
* @summary gssapi wrap for CFX per-message tokens always set FLAG_ACCEPTOR_SUBKEY
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file AcceptorSubKey.java
* @run main/othervm AcceptorSubKey 0
* @run main/othervm AcceptorSubKey 4
diff --git a/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java b/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java
index 0d3985be028..de0dc89491c 100644
--- a/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java
+++ b/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 4501327 4868379 8039132
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm AddressesAndNameType 1
* @run main/othervm AddressesAndNameType 2
* @run main/othervm AddressesAndNameType 3
diff --git a/jdk/test/sun/security/krb5/auto/BadKdc1.java b/jdk/test/sun/security/krb5/auto/BadKdc1.java
index 8108535d284..9921f12b82d 100644
--- a/jdk/test/sun/security/krb5/auto/BadKdc1.java
+++ b/jdk/test/sun/security/krb5/auto/BadKdc1.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm/timeout=300 BadKdc1
* @summary krb5 should not try to access unavailable kdc too often
*/
@@ -64,4 +57,3 @@ public class BadKdc1 {
);
}
}
-
diff --git a/jdk/test/sun/security/krb5/auto/BadKdc2.java b/jdk/test/sun/security/krb5/auto/BadKdc2.java
index 403a9111c11..4291d5c14c0 100644
--- a/jdk/test/sun/security/krb5/auto/BadKdc2.java
+++ b/jdk/test/sun/security/krb5/auto/BadKdc2.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm/timeout=300 BadKdc2
* @summary krb5 should not try to access unavailable kdc too often
*/
diff --git a/jdk/test/sun/security/krb5/auto/BadKdc3.java b/jdk/test/sun/security/krb5/auto/BadKdc3.java
index f739ce0078f..4bafd9a2ffe 100644
--- a/jdk/test/sun/security/krb5/auto/BadKdc3.java
+++ b/jdk/test/sun/security/krb5/auto/BadKdc3.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm/timeout=300 BadKdc3
* @summary krb5 should not try to access unavailable kdc too often
*/
diff --git a/jdk/test/sun/security/krb5/auto/BadKdc4.java b/jdk/test/sun/security/krb5/auto/BadKdc4.java
index a45d9f15624..877e5400df9 100644
--- a/jdk/test/sun/security/krb5/auto/BadKdc4.java
+++ b/jdk/test/sun/security/krb5/auto/BadKdc4.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm/timeout=300 BadKdc4
* @summary krb5 should not try to access unavailable kdc too often
*/
diff --git a/jdk/test/sun/security/krb5/auto/Basic.java b/jdk/test/sun/security/krb5/auto/Basic.java
index c16d0373131..ef7f11db509 100644
--- a/jdk/test/sun/security/krb5/auto/Basic.java
+++ b/jdk/test/sun/security/krb5/auto/Basic.java
@@ -25,14 +25,6 @@
* @test
* @bug 7152176
* @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file Basic.java
* @run main/othervm Basic
*/
diff --git a/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java b/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java
index 7fb18b0f9bf..3a60cc2fd9a 100644
--- a/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java
+++ b/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java
@@ -25,14 +25,6 @@
* @test
* @bug 6706974
* @summary Add krb5 test infrastructure
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file BasicKrb5Test.java
* @run main/othervm BasicKrb5Test
* @run main/othervm BasicKrb5Test des-cbc-crc
diff --git a/jdk/test/sun/security/krb5/auto/BasicProc.java b/jdk/test/sun/security/krb5/auto/BasicProc.java
index 8cfee2b1892..54b204fb420 100644
--- a/jdk/test/sun/security/krb5/auto/BasicProc.java
+++ b/jdk/test/sun/security/krb5/auto/BasicProc.java
@@ -26,13 +26,6 @@
* @bug 8009977
* @summary A test library to launch multiple Java processes
* @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file BasicProc.java
* @run main/othervm BasicProc
*/
diff --git a/jdk/test/sun/security/krb5/auto/CleanState.java b/jdk/test/sun/security/krb5/auto/CleanState.java
index 1c76cfd99be..b63e23deffe 100644
--- a/jdk/test/sun/security/krb5/auto/CleanState.java
+++ b/jdk/test/sun/security/krb5/auto/CleanState.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6716534
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file CleanState.java
* @run main/othervm CleanState
* @summary Krb5LoginModule has not cleaned temp info between authentication attempts
diff --git a/jdk/test/sun/security/krb5/auto/CrossRealm.java b/jdk/test/sun/security/krb5/auto/CrossRealm.java
index 97d29452742..26dc6ae6419 100644
--- a/jdk/test/sun/security/krb5/auto/CrossRealm.java
+++ b/jdk/test/sun/security/krb5/auto/CrossRealm.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6706974
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file CrossRealm.java
* @run main/othervm CrossRealm
* @summary Add krb5 test infrastructure
diff --git a/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java b/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java
index 0290d442cff..38bacb861e3 100644
--- a/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java
+++ b/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java
@@ -25,14 +25,6 @@
* @test
* @bug 8005447
* @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file DiffNameSameKey.java
* @run main/othervm/fail DiffNameSameKey a
* @run main/othervm DiffNameSameKey b
diff --git a/jdk/test/sun/security/krb5/auto/DupEtypes.java b/jdk/test/sun/security/krb5/auto/DupEtypes.java
index 55fd273995a..efc26e825c0 100644
--- a/jdk/test/sun/security/krb5/auto/DupEtypes.java
+++ b/jdk/test/sun/security/krb5/auto/DupEtypes.java
@@ -25,14 +25,6 @@
* @test
* @bug 7067974
* @summary multiple ETYPE-INFO-ENTRY with same etype and different salt
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file DupEtypes.java
* @run main/othervm DupEtypes 1
* @run main/othervm DupEtypes 2
diff --git a/jdk/test/sun/security/krb5/auto/DynamicKeytab.java b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java
index eaaee087f29..dd9e67cac8a 100644
--- a/jdk/test/sun/security/krb5/auto/DynamicKeytab.java
+++ b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6894072
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file DynamicKeytab.java
* @run main/othervm DynamicKeytab
* @summary always refresh keytab
diff --git a/jdk/test/sun/security/krb5/auto/EmptyPassword.java b/jdk/test/sun/security/krb5/auto/EmptyPassword.java
index 4a631ef68ed..d66b202ec37 100644
--- a/jdk/test/sun/security/krb5/auto/EmptyPassword.java
+++ b/jdk/test/sun/security/krb5/auto/EmptyPassword.java
@@ -25,13 +25,6 @@
* @test
* @bug 6879540
* @summary enable empty password for kerberos 5
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file EmptyPassword.java
* @run main/othervm EmptyPassword
*/
diff --git a/jdk/test/sun/security/krb5/auto/FileKeyTab.java b/jdk/test/sun/security/krb5/auto/FileKeyTab.java
index e7333e12c66..62b4b02704f 100644
--- a/jdk/test/sun/security/krb5/auto/FileKeyTab.java
+++ b/jdk/test/sun/security/krb5/auto/FileKeyTab.java
@@ -25,13 +25,6 @@
* @test
* @bug 7152121
* @summary Krb5LoginModule no longer handles keyTabNames with "file:" prefix
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file FileKeyTab.java
* @run main/othervm FileKeyTab
*/
diff --git a/jdk/test/sun/security/krb5/auto/ForwardableCheck.java b/jdk/test/sun/security/krb5/auto/ForwardableCheck.java
index b5ffe5df05b..df6e49ec66b 100644
--- a/jdk/test/sun/security/krb5/auto/ForwardableCheck.java
+++ b/jdk/test/sun/security/krb5/auto/ForwardableCheck.java
@@ -25,14 +25,6 @@
* @test
* @bug 8022582
* @summary Relax response flags checking in sun.security.krb5.KrbKdcRep.check.
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file ForwardableCheck.java
* @run main/othervm ForwardableCheck
*/
diff --git a/jdk/test/sun/security/krb5/auto/GSS.java b/jdk/test/sun/security/krb5/auto/GSS.java
index 00d9b69c5ec..8e782095884 100644
--- a/jdk/test/sun/security/krb5/auto/GSS.java
+++ b/jdk/test/sun/security/krb5/auto/GSS.java
@@ -25,14 +25,6 @@
* @test
* @bug 7152176
* @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file GSS.java
* @run main/othervm GSS
*/
diff --git a/jdk/test/sun/security/krb5/auto/GSSUnbound.java b/jdk/test/sun/security/krb5/auto/GSSUnbound.java
index 973920d8c0f..74f0e9a91ec 100644
--- a/jdk/test/sun/security/krb5/auto/GSSUnbound.java
+++ b/jdk/test/sun/security/krb5/auto/GSSUnbound.java
@@ -25,14 +25,6 @@
* @test
* @bug 8001104
* @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file GSSUnbound.java
* @run main/othervm GSSUnbound
*/
diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
index 70c95f72fe3..96245002874 100644
--- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
+++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
@@ -24,15 +24,6 @@
/*
* @test
* @bug 6578647 6829283
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.base/sun.util.logging
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm HttpNegotiateServer
* @summary Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication()
* @summary HTTP/Negotiate: Authenticator triggered again when user cancels the first one
@@ -76,9 +67,6 @@ import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSManager;
import sun.security.jgss.GSSUtil;
import sun.security.krb5.Config;
-import java.util.Base64;
-import sun.util.logging.PlatformLogger;
-
import java.util.Base64;
/**
@@ -172,9 +160,7 @@ public class HttpNegotiateServer {
public static void main(String[] args)
throws Exception {
- String HTTPLOG = "sun.net.www.protocol.http.HttpURLConnection";
System.setProperty("sun.security.krb5.debug", "true");
- PlatformLogger.getLogger(HTTPLOG).setLevel(PlatformLogger.Level.ALL);
KDC kdcw = KDC.create(REALM_WEB);
kdcw.addPrincipal(WEB_USER, WEB_PASS);
diff --git a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java b/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java
index 6f675ddca8b..e2641a9a4f9 100644
--- a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java
+++ b/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6851973
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm IgnoreChannelBinding
* @summary ignore incoming channel binding if acceptor does not set one
*/
diff --git a/jdk/test/sun/security/krb5/auto/KDC.java b/jdk/test/sun/security/krb5/auto/KDC.java
index d09d8e1d240..d4a919f7a76 100644
--- a/jdk/test/sun/security/krb5/auto/KDC.java
+++ b/jdk/test/sun/security/krb5/auto/KDC.java
@@ -30,6 +30,7 @@ import java.lang.reflect.Method;
import java.security.SecureRandom;
import java.util.*;
import java.util.concurrent.*;
+
import sun.net.spi.nameservice.NameService;
import sun.net.spi.nameservice.NameServiceDescriptor;
import sun.security.krb5.*;
@@ -155,6 +156,8 @@ public class KDC {
DatagramSocket u1 = null;
ServerSocket t1 = null;
+ public static enum KtabMode { APPEND, EXISTING };
+
/**
* Option names, to be expanded forever.
*/
@@ -1316,6 +1319,68 @@ public class KDC {
// OK
}
}
+
+ public static void startKDC(final String host, final String krbConfFileName,
+ final String realm, final Map principals,
+ final String ktab, final KtabMode mode) {
+
+ try {
+ KDC kdc = KDC.create(realm, host, 0, true);
+ kdc.setOption(KDC.Option.PREAUTH_REQUIRED, Boolean.FALSE);
+ KDC.saveConfig(krbConfFileName, kdc);
+
+ // Add principals
+ if (principals != null) {
+ principals.forEach((name, password) -> {
+ if (password == null || password.isEmpty()) {
+ System.out.println(String.format(
+ "KDC:add a principal '%s' with a random " +
+ "password", name));
+ kdc.addPrincipalRandKey(name);
+ } else {
+ System.out.println(String.format(
+ "KDC:add a principal '%s' with '%s' password",
+ name, password));
+ kdc.addPrincipal(name, password.toCharArray());
+ }
+ });
+ }
+
+ // Create or append keys to existing keytab file
+ if (ktab != null) {
+ File ktabFile = new File(ktab);
+ switch(mode) {
+ case APPEND:
+ if (ktabFile.exists()) {
+ System.out.println(String.format(
+ "KDC:append keys to an exising keytab "
+ + "file %s", ktab));
+ kdc.appendKtab(ktab);
+ } else {
+ System.out.println(String.format(
+ "KDC:create a new keytab file %s", ktab));
+ kdc.writeKtab(ktab);
+ }
+ break;
+ case EXISTING:
+ System.out.println(String.format(
+ "KDC:use an existing keytab file %s", ktab));
+ break;
+ default:
+ throw new RuntimeException(String.format(
+ "KDC:unsupported keytab mode: %s", mode));
+ }
+ }
+
+ System.out.println(String.format(
+ "KDC: started on %s:%s with '%s' realm",
+ host, kdc.getPort(), realm));
+ } catch (Exception e) {
+ throw new RuntimeException("KDC: unexpected exception", e);
+ }
+
+ }
+
/**
* Helper class to encapsulate a job in a KDC.
*/
diff --git a/jdk/test/sun/security/krb5/auto/KPEquals.java b/jdk/test/sun/security/krb5/auto/KPEquals.java
index b9b314805c2..7a7aaa34f24 100644
--- a/jdk/test/sun/security/krb5/auto/KPEquals.java
+++ b/jdk/test/sun/security/krb5/auto/KPEquals.java
@@ -25,14 +25,6 @@
* @test
* @bug 8015669
* @summary KerberosPrincipal::equals should ignore name-type
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file KPEquals.java
* @run main/othervm KPEquals
*/
diff --git a/jdk/test/sun/security/krb5/auto/KeyPermissions.java b/jdk/test/sun/security/krb5/auto/KeyPermissions.java
index 4e90d29bcae..78f0eafc6c5 100644
--- a/jdk/test/sun/security/krb5/auto/KeyPermissions.java
+++ b/jdk/test/sun/security/krb5/auto/KeyPermissions.java
@@ -25,14 +25,6 @@
* @test
* @bug 8004488
* @summary wrong permissions checked in krb5
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file KeyPermissions.java
* @run main/othervm KeyPermissions
*/
diff --git a/jdk/test/sun/security/krb5/auto/KeyTabCompat.java b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java
index 3939b524ff2..00a7f7cd837 100644
--- a/jdk/test/sun/security/krb5/auto/KeyTabCompat.java
+++ b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java
@@ -25,14 +25,6 @@
* @test
* @bug 6894072
* @bug 8004488
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file KeyTabCompat.java
* @run main/othervm KeyTabCompat
* @summary always refresh keytab
diff --git a/jdk/test/sun/security/krb5/auto/KvnoNA.java b/jdk/test/sun/security/krb5/auto/KvnoNA.java
index 4dd4e9ea8c0..2c645ecf357 100644
--- a/jdk/test/sun/security/krb5/auto/KvnoNA.java
+++ b/jdk/test/sun/security/krb5/auto/KvnoNA.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 7197159
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file KvnoNA.java
* @run main/othervm KvnoNA
* @summary accept different kvno if there no match
diff --git a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java
index eb924fd1a38..961990bdda7 100644
--- a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java
+++ b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6857802
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm LifeTimeInSeconds
* @summary GSS getRemainingInitLifetime method returns milliseconds not seconds
*/
diff --git a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java
index 42feacc8241..2c77451d748 100644
--- a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java
+++ b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6765491
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm LoginModuleOptions
* @summary Krb5LoginModule a little too restrictive, and the doc is not clear.
*/
diff --git a/jdk/test/sun/security/krb5/auto/LoginNoPass.java b/jdk/test/sun/security/krb5/auto/LoginNoPass.java
index 019dc102f6f..73de94001ae 100644
--- a/jdk/test/sun/security/krb5/auto/LoginNoPass.java
+++ b/jdk/test/sun/security/krb5/auto/LoginNoPass.java
@@ -25,14 +25,6 @@
* @test
* @bug 8028351
* @summary JWS doesn't get authenticated when using kerberos auth proxy
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file LoginNoPass.java
* @run main/othervm LoginNoPass
*/
diff --git a/jdk/test/sun/security/krb5/auto/MSOID2.java b/jdk/test/sun/security/krb5/auto/MSOID2.java
index e3c3ce83e33..a10d38325ac 100644
--- a/jdk/test/sun/security/krb5/auto/MSOID2.java
+++ b/jdk/test/sun/security/krb5/auto/MSOID2.java
@@ -25,15 +25,6 @@
* @test
* @bug 8078439
* @summary SPNEGO auth fails if client proposes MS krb5 OID
- * @modules java.base/sun.misc
- * java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file MSOID2.java
* @run main/othervm MSOID2
*/
diff --git a/jdk/test/sun/security/krb5/auto/MaxRetries.java b/jdk/test/sun/security/krb5/auto/MaxRetries.java
index adcbc646cc8..880c0233381 100644
--- a/jdk/test/sun/security/krb5/auto/MaxRetries.java
+++ b/jdk/test/sun/security/krb5/auto/MaxRetries.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6844193
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file MaxRetries.java
* @run main/othervm/timeout=300 MaxRetries
* @summary support max_retries in krb5.conf
diff --git a/jdk/test/sun/security/krb5/auto/MoreKvno.java b/jdk/test/sun/security/krb5/auto/MoreKvno.java
index bdb1d9a4381..8abb1e23ffb 100644
--- a/jdk/test/sun/security/krb5/auto/MoreKvno.java
+++ b/jdk/test/sun/security/krb5/auto/MoreKvno.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6893158 6907425 7197159
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm MoreKvno
* @summary AP_REQ check should use key version number
*/
diff --git a/jdk/test/sun/security/krb5/auto/NewInquireTypes.java b/jdk/test/sun/security/krb5/auto/NewInquireTypes.java
index 63d9efa24ac..bb4d041b413 100644
--- a/jdk/test/sun/security/krb5/auto/NewInquireTypes.java
+++ b/jdk/test/sun/security/krb5/auto/NewInquireTypes.java
@@ -25,14 +25,6 @@
* @test
* @bug 8043071
* @summary Expose session key and KRB_CRED through extended GSS-API
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file NewInquireTypes.java
* @run main/othervm NewInquireTypes
*/
diff --git a/jdk/test/sun/security/krb5/auto/NewSalt.java b/jdk/test/sun/security/krb5/auto/NewSalt.java
index ec9fa2ce14f..2a0a17fcd9f 100644
--- a/jdk/test/sun/security/krb5/auto/NewSalt.java
+++ b/jdk/test/sun/security/krb5/auto/NewSalt.java
@@ -25,14 +25,6 @@
* @test
* @bug 6960894
* @summary Better AS-REQ creation and processing
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm NewSalt
* @run main/othervm -Dnopreauth NewSalt
* @run main/othervm -Donlyonepreauth NewSalt
diff --git a/jdk/test/sun/security/krb5/auto/NoAddresses.java b/jdk/test/sun/security/krb5/auto/NoAddresses.java
index 15e7fe198cf..04c5b71e52a 100644
--- a/jdk/test/sun/security/krb5/auto/NoAddresses.java
+++ b/jdk/test/sun/security/krb5/auto/NoAddresses.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 7032354
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm NoAddresses 1
* @run main/othervm NoAddresses 2
* @run main/othervm/fail NoAddresses 3
diff --git a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java
index 571f54c7c89..cde2ec6bbe4 100644
--- a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java
+++ b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java
@@ -25,14 +25,6 @@
* @test
* @bug 7089889
* @summary Krb5LoginModule.login() throws an exception if used without a keytab
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file NoInitNoKeytab.java
* @run main/othervm NoInitNoKeytab
*/
diff --git a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java b/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java
index cdd05c241c9..304dca1be89 100644
--- a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java
+++ b/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6733095
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm NonMutualSpnego
* @summary Failure when SPNEGO request non-Mutual
*/
diff --git a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java b/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java
index 555f15ff696..2bb59a2990f 100644
--- a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java
+++ b/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 8001326
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm NoneReplayCacheTest
* @summary the replaycache type none cannot stop an authenticator replay,
* but it can stop a message replay when s.s.k.acceptor.subkey is true.
diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegate.java b/jdk/test/sun/security/krb5/auto/OkAsDelegate.java
index d8bc5b5b1ec..198de7d78ca 100644
--- a/jdk/test/sun/security/krb5/auto/OkAsDelegate.java
+++ b/jdk/test/sun/security/krb5/auto/OkAsDelegate.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6853328 7172701
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm OkAsDelegate false true true false false false
* FORWARDABLE ticket not allowed, always fail
* @run main/othervm OkAsDelegate true false false false false false
diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java
index 77d7d08a2f9..ce71314339e 100644
--- a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java
+++ b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6853328 7172701
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm OkAsDelegateXRealm false
* KDC no OK-AS-DELEGATE, fail
* @run main/othervm -Dtest.kdc.policy.ok-as-delegate OkAsDelegateXRealm true
diff --git a/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java b/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java
index 892a153528e..c4b03d166f8 100644
--- a/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java
+++ b/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java
@@ -25,13 +25,6 @@
* @test
* @bug 8014310
* @summary JAAS/Krb5LoginModule using des encytypes failure with NPE after JDK-8012679
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file OnlyDesLogin.java
* @run main/othervm OnlyDesLogin
*/
diff --git a/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java b/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java
index c911e160f36..c4ae6b9aa9d 100644
--- a/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java
+++ b/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java
@@ -25,14 +25,6 @@
* @test
* @bug 7061379
* @summary [Kerberos] Cross-realm authentication fails, due to nameType problem
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file PrincipalNameEquals.java
* @run main/othervm PrincipalNameEquals
*/
diff --git a/jdk/test/sun/security/krb5/auto/RRC.java b/jdk/test/sun/security/krb5/auto/RRC.java
index 7e5c8e0e59f..ade12a40abe 100644
--- a/jdk/test/sun/security/krb5/auto/RRC.java
+++ b/jdk/test/sun/security/krb5/auto/RRC.java
@@ -25,14 +25,6 @@
* @test
* @bug 7077640
* @summary gss wrap for cfx doesn't handle rrc != 0
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file RRC.java
* @run main/othervm RRC
*/
diff --git a/jdk/test/sun/security/krb5/auto/Renewal.java b/jdk/test/sun/security/krb5/auto/Renewal.java
index 55ec2f9d838..36cf3148569 100644
--- a/jdk/test/sun/security/krb5/auto/Renewal.java
+++ b/jdk/test/sun/security/krb5/auto/Renewal.java
@@ -27,13 +27,6 @@
* @summary Add kinit options and krb5.conf flags that allow users to
* obtain renewable tickets and specify ticket lifetimes
* @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file Renewal.java
* @run main/othervm Renewal
*/
diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java b/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java
index d7aa4b0061c..da68ec3b7e1 100644
--- a/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java
+++ b/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java
@@ -24,8 +24,6 @@
/*
* @test
* @bug 8001326
- * @modules java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.rcache
* @run main/othervm ReplayCacheExpunge 16
* @run main/othervm/fail ReplayCacheExpunge 15
* @summary when number of expired entries minus number of good entries
diff --git a/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java b/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java
index 708392295f0..c23645bc11f 100644
--- a/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java
+++ b/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java
@@ -24,9 +24,6 @@
/*
* @test
* @bug 8001326
- * @modules java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.rcache
* @run main/othervm ReplayCachePrecise
* @summary when there are 2 two AuthTime with the same time but different hash,
* it's not a replay.
diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java
index 3a6ef72e42e..79a4da79f2d 100644
--- a/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java
+++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 7118809 8001326
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm ReplayCacheTest jvm
* @run main/othervm ReplayCacheTest dfl
* @summary rcache deadlock
diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
index b30abb3e6fc..5275b69b594 100644
--- a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
+++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
@@ -26,16 +26,6 @@
* @bug 7152176
* @summary More krb5 tests
* @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.misc
- * java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
- * java.security.jgss/sun.security.krb5.internal.rcache
* @compile -XDignore.symbol.file ReplayCacheTestProc.java
* @run main/othervm/timeout=100 ReplayCacheTestProc
*/
diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxy.java b/jdk/test/sun/security/krb5/auto/S4U2proxy.java
index 29c85dc7757..10e565279f0 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2proxy.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2proxy.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584 8044215
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2proxy.java
* @run main/othervm S4U2proxy krb5
* @run main/othervm S4U2proxy spnego
diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java b/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java
index 8fb704bcbc8..f2f0b305e05 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2proxyGSS.java
* @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS krb5
* @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS spnego
diff --git a/jdk/test/sun/security/krb5/auto/S4U2self.java b/jdk/test/sun/security/krb5/auto/S4U2self.java
index 0881e9622b9..a6c4b21c192 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2self.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2self.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2self.java
* @run main/othervm -Dsun.security.krb5.debug=false S4U2self krb5 0
* @run main/othervm/fail -Dsun.security.krb5.debug=false S4U2self krb5 1
diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java b/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java
index 26390ca2904..467129c16e3 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2selfAsServer.java
* @run main/othervm S4U2selfAsServer krb5
* @run main/othervm S4U2selfAsServer spnego
diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java b/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java
index 7375502f422..0ff2b7bb53d 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2selfAsServerGSS.java
* @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS krb5
* @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS spnego
diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java b/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java
index 48250a94edb..f060c787ffb 100644
--- a/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java
+++ b/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java
@@ -25,14 +25,6 @@
* @test
* @bug 6355584
* @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file S4U2selfGSS.java
* @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS krb5
* @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS spnego
diff --git a/jdk/test/sun/security/krb5/auto/SPNEGO.java b/jdk/test/sun/security/krb5/auto/SPNEGO.java
index da9fdab1f89..250a942f0d4 100644
--- a/jdk/test/sun/security/krb5/auto/SPNEGO.java
+++ b/jdk/test/sun/security/krb5/auto/SPNEGO.java
@@ -25,14 +25,6 @@
* @test
* @bug 7040151
* @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file SPNEGO.java
* @run main/othervm SPNEGO
*/
diff --git a/jdk/test/sun/security/krb5/auto/SSL.java b/jdk/test/sun/security/krb5/auto/SSL.java
index 8e80842bb4a..02317138102 100644
--- a/jdk/test/sun/security/krb5/auto/SSL.java
+++ b/jdk/test/sun/security/krb5/auto/SSL.java
@@ -25,15 +25,6 @@
* @test
* @bug 6894643 6913636 8005523 8025123
* @summary Test JSSE Kerberos ciphersuite
-
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA
* @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound
* @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound sni
diff --git a/jdk/test/sun/security/krb5/auto/SaslBasic.java b/jdk/test/sun/security/krb5/auto/SaslBasic.java
index f00b3254c68..3fdd3534ed4 100644
--- a/jdk/test/sun/security/krb5/auto/SaslBasic.java
+++ b/jdk/test/sun/security/krb5/auto/SaslBasic.java
@@ -25,14 +25,6 @@
* @test
* @bug 7110803
* @summary SASL service for multiple hostnames
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
- * java.security.sasl
* @compile -XDignore.symbol.file SaslBasic.java
* @run main/othervm SaslBasic bound
* @run main/othervm SaslBasic unbound
diff --git a/jdk/test/sun/security/krb5/auto/SaslGSS.java b/jdk/test/sun/security/krb5/auto/SaslGSS.java
index edc7d3634d4..ec541935308 100644
--- a/jdk/test/sun/security/krb5/auto/SaslGSS.java
+++ b/jdk/test/sun/security/krb5/auto/SaslGSS.java
@@ -26,15 +26,6 @@
* @bug 8012082 8019267
* @summary SASL: auth-conf negotiated, but unencrypted data is accepted,
* reset to unencrypt
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
- * java.security.sasl
* @compile -XDignore.symbol.file SaslGSS.java
* @run main/othervm SaslGSS
*/
diff --git a/jdk/test/sun/security/krb5/auto/SaslUnbound.java b/jdk/test/sun/security/krb5/auto/SaslUnbound.java
index 2693c9019b4..797d66b94be 100644
--- a/jdk/test/sun/security/krb5/auto/SaslUnbound.java
+++ b/jdk/test/sun/security/krb5/auto/SaslUnbound.java
@@ -25,14 +25,6 @@
* @test
* @bug 8001104
* @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
- * java.security.sasl
* @compile -XDignore.symbol.file SaslUnbound.java
* @run main/othervm SaslUnbound 0
* @run main/othervm/fail SaslUnbound 1
diff --git a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java
index 3d5a9e46326..906cfbee786 100644
--- a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java
+++ b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java
@@ -25,14 +25,6 @@
* @test
* @bug 8000653
* @summary SPNEGO tests fail at context.getDelegCred().getRemainingInitLifetime(mechOid)
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file SpnegoLifeTime.java
* @run main/othervm SpnegoLifeTime
*/
diff --git a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java b/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java
index fe35bfe3691..62c55048d1f 100644
--- a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java
+++ b/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6815182
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm SpnegoReqFlags
* @summary GSSAPI/SPNEGO does not work with server using MIT Kerberos library
*/
diff --git a/jdk/test/sun/security/krb5/auto/TEST.properties b/jdk/test/sun/security/krb5/auto/TEST.properties
new file mode 100644
index 00000000000..681450777d0
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/TEST.properties
@@ -0,0 +1,10 @@
+modules java.base/sun.misc \
+ java.base/sun.net.spi.nameservice \
+ java.base/sun.security.util \
+ java.security.jgss/sun.security.jgss \
+ java.security.jgss/sun.security.krb5 \
+ java.security.jgss/sun.security.krb5.internal \
+ java.security.jgss/sun.security.krb5.internal.ccache \
+ java.security.jgss/sun.security.krb5.internal.rcache \
+ java.security.jgss/sun.security.krb5.internal.crypto \
+ java.security.jgss/sun.security.krb5.internal.ktab
diff --git a/jdk/test/sun/security/krb5/auto/TcpTimeout.java b/jdk/test/sun/security/krb5/auto/TcpTimeout.java
index 73372e47bae..45699fbe5ad 100644
--- a/jdk/test/sun/security/krb5/auto/TcpTimeout.java
+++ b/jdk/test/sun/security/krb5/auto/TcpTimeout.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 6952519
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file TcpTimeout.java
* @run main/othervm TcpTimeout
* @summary kdc_timeout is not being honoured when using TCP
diff --git a/jdk/test/sun/security/krb5/auto/Test5653.java b/jdk/test/sun/security/krb5/auto/Test5653.java
index a5c935d8215..4384b87ee0b 100644
--- a/jdk/test/sun/security/krb5/auto/Test5653.java
+++ b/jdk/test/sun/security/krb5/auto/Test5653.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6895424
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm Test5653
* @summary RFC 5653
*/
diff --git a/jdk/test/sun/security/krb5/auto/TwoOrThree.java b/jdk/test/sun/security/krb5/auto/TwoOrThree.java
index 1eb02205af4..5af545be4a1 100644
--- a/jdk/test/sun/security/krb5/auto/TwoOrThree.java
+++ b/jdk/test/sun/security/krb5/auto/TwoOrThree.java
@@ -25,14 +25,6 @@
* @test
* @bug 8005447
* @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file TwoOrThree.java
* @run main/othervm TwoOrThree first first
* @run main/othervm/fail TwoOrThree first second
diff --git a/jdk/test/sun/security/krb5/auto/TwoPrinces.java b/jdk/test/sun/security/krb5/auto/TwoPrinces.java
index 0f30e9475ed..30f16e96a25 100644
--- a/jdk/test/sun/security/krb5/auto/TwoPrinces.java
+++ b/jdk/test/sun/security/krb5/auto/TwoPrinces.java
@@ -24,14 +24,6 @@
/*
* @test
* @bug 6894072
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file TwoPrinces.java
* @run main/othervm TwoPrinces
* @summary always refresh keytab
diff --git a/jdk/test/sun/security/krb5/auto/TwoTab.java b/jdk/test/sun/security/krb5/auto/TwoTab.java
index f3def8b038e..dd2cf96a8a4 100644
--- a/jdk/test/sun/security/krb5/auto/TwoTab.java
+++ b/jdk/test/sun/security/krb5/auto/TwoTab.java
@@ -25,14 +25,6 @@
* @test
* @bug 7152176
* @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file TwoTab.java
* @run main/othervm TwoTab
*/
diff --git a/jdk/test/sun/security/krb5/auto/UdpTcp.java b/jdk/test/sun/security/krb5/auto/UdpTcp.java
index 66c82438a2e..ae54b793527 100644
--- a/jdk/test/sun/security/krb5/auto/UdpTcp.java
+++ b/jdk/test/sun/security/krb5/auto/UdpTcp.java
@@ -24,13 +24,6 @@
/*
* @test
* @bug 4966382 8039132
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm UdpTcp UDP
* @run main/othervm UdpTcp TCP
* @summary udp or tcp
diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSL.java b/jdk/test/sun/security/krb5/auto/UnboundSSL.java
index 0862f072f04..5df24f85217 100644
--- a/jdk/test/sun/security/krb5/auto/UnboundSSL.java
+++ b/jdk/test/sun/security/krb5/auto/UnboundSSL.java
@@ -26,6 +26,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.PrivilegedActionException;
import java.util.HashMap;
import java.util.Map;
+
import javax.security.auth.login.LoginException;
/*
@@ -74,8 +75,9 @@ public class UnboundSSL {
UnboundSSLUtils.KRB5_CONF_FILENAME);
// start a local KDC instance
- UnboundSSLUtils.startKDC(UnboundSSLUtils.REALM, principals,
- UnboundSSLUtils.KTAB_FILENAME, UnboundSSLUtils.KtabMode.APPEND);
+ KDC.startKDC(UnboundSSLUtils.HOST, UnboundSSLUtils.KRB5_CONF_FILENAME,
+ UnboundSSLUtils.REALM, principals,
+ UnboundSSLUtils.KTAB_FILENAME, KDC.KtabMode.APPEND);
System.setProperty("java.security.auth.login.config",
UnboundSSLUtils.TEST_SRC + UnboundSSLUtils.FS + jaacConfigFile);
diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java b/jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java
index 255a40ca106..aa1ea2b38ce 100644
--- a/jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java
+++ b/jdk/test/sun/security/krb5/auto/UnboundSSLMultipleKeys.java
@@ -26,6 +26,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.PrivilegedActionException;
import java.util.HashMap;
import java.util.Map;
+
import javax.security.auth.login.LoginException;
/*
@@ -81,8 +82,9 @@ public class UnboundSSLMultipleKeys {
* principal, but password for only one key is the same with the record
* for service1 principal in KDC.
*/
- UnboundSSLUtils.startKDC(UnboundSSLUtils.REALM, principals,
- UnboundSSLUtils.KTAB_FILENAME, UnboundSSLUtils.KtabMode.APPEND);
+ KDC.startKDC(UnboundSSLUtils.HOST, UnboundSSLUtils.KRB5_CONF_FILENAME,
+ UnboundSSLUtils.REALM, principals,
+ UnboundSSLUtils.KTAB_FILENAME, KDC.KtabMode.APPEND);
System.setProperty("java.security.auth.login.config",
UnboundSSLUtils.TEST_SRC + UnboundSSLUtils.FS + jaacConfigFile);
diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java b/jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java
index 3ccb4bf604a..ab8549eb87c 100644
--- a/jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java
+++ b/jdk/test/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java
@@ -70,8 +70,9 @@ public class UnboundSSLPrincipalProperty {
UnboundSSLUtils.KRB5_CONF_FILENAME);
// start a local KDC instance
- UnboundSSLUtils.startKDC(UnboundSSLUtils.REALM, principals,
- UnboundSSLUtils.KTAB_FILENAME, UnboundSSLUtils.KtabMode.APPEND);
+ KDC.startKDC(UnboundSSLUtils.HOST, UnboundSSLUtils.KRB5_CONF_FILENAME,
+ UnboundSSLUtils.REALM, principals,
+ UnboundSSLUtils.KTAB_FILENAME, KDC.KtabMode.APPEND);
System.setProperty("java.security.auth.login.config",
UnboundSSLUtils.TEST_SRC + UnboundSSLUtils.FS + jaacConfigFile);
diff --git a/jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java b/jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java
index ab55e1fa184..1aefac2c332 100644
--- a/jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java
+++ b/jdk/test/sun/security/krb5/auto/UnboundSSLUtils.java
@@ -50,8 +50,6 @@ import javax.security.auth.login.LoginException;
*/
class UnboundSSLUtils {
- static enum KtabMode { APPEND, EXISTING };
-
static final String KTAB_FILENAME = "krb5.keytab.data";
static final String HOST = "localhost";
static final String REALM = "TEST.REALM";
@@ -87,65 +85,6 @@ class UnboundSSLUtils {
});
}
- /*
- * Start a KDC server:
- * - create a KDC instance
- * - create Kerberos principals
- * - save Kerberos configuration
- * - save keys to keytab file
- * - no pre-auth required
- */
- static void startKDC(String realm, Map principals,
- String ktab, KtabMode mode) {
- try {
- KDC kdc = KDC.create(realm, HOST, 0, true);
- kdc.setOption(KDC.Option.PREAUTH_REQUIRED, Boolean.FALSE);
- if (principals != null) {
- for (Map.Entry entry : principals.entrySet()) {
- String name = entry.getKey();
- String password = entry.getValue();
- if (password == null || password.isEmpty()) {
- System.out.println("KDC: add a principal '" + name +
- "' with a random password");
- kdc.addPrincipalRandKey(name);
- } else {
- System.out.println("KDC: add a principal '" + name +
- "' with '" + password + "' password");
- kdc.addPrincipal(name, password.toCharArray());
- }
- }
- }
-
- KDC.saveConfig(KRB5_CONF_FILENAME, kdc);
-
- if (ktab != null) {
- File ktabFile = new File(ktab);
- if (mode == KtabMode.APPEND) {
- if (ktabFile.exists()) {
- System.out.println("KDC: append keys to an exising " +
- "keytab file " + ktab);
- kdc.appendKtab(ktab);
- } else {
- System.out.println("KDC: create a new keytab file " +
- ktab);
- kdc.writeKtab(ktab);
- }
- } else if (mode == KtabMode.EXISTING) {
- System.out.println("KDC: use an existing keytab file "
- + ktab);
- } else {
- throw new RuntimeException("KDC: unsupported keytab mode: "
- + mode);
- }
- }
-
- System.out.println("KDC: started on " + HOST + ":" + kdc.getPort()
- + " with '" + realm + "' realm");
- } catch (Exception e) {
- throw new RuntimeException("KDC: unexpected exception", e);
- }
- }
-
}
class SSLClient {
diff --git a/jdk/test/sun/security/krb5/auto/UnboundService.java b/jdk/test/sun/security/krb5/auto/UnboundService.java
index a0bc937b29e..1327f78c995 100644
--- a/jdk/test/sun/security/krb5/auto/UnboundService.java
+++ b/jdk/test/sun/security/krb5/auto/UnboundService.java
@@ -25,14 +25,6 @@
* @test
* @bug 8001104
* @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.jgss
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file UnboundService.java
* @run main/othervm UnboundService null null
* @run main/othervm UnboundService server/host.rabbit.hole null
diff --git a/jdk/test/sun/security/krb5/auto/Unreachable.java b/jdk/test/sun/security/krb5/auto/Unreachable.java
index 670d33afc8e..52339786a9f 100644
--- a/jdk/test/sun/security/krb5/auto/Unreachable.java
+++ b/jdk/test/sun/security/krb5/auto/Unreachable.java
@@ -25,7 +25,6 @@
* @test
* @bug 7162687
* @summary enhance KDC server availability detection
- * @modules java.security.jgss/sun.security.krb5
* @compile -XDignore.symbol.file Unreachable.java
* @run main/othervm/timeout=10 Unreachable
*/
diff --git a/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java b/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java
index ca1229b90b9..3769643e09a 100644
--- a/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java
+++ b/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java
@@ -26,13 +26,6 @@
* @bug 7201053
* @summary Krb5LoginModule shows NPE when both useTicketCache and storeKey
* are set to true
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @compile -XDignore.symbol.file UseCacheAndStoreKey.java
* @run main/othervm UseCacheAndStoreKey
*/
diff --git a/jdk/test/sun/security/krb5/auto/W83.java b/jdk/test/sun/security/krb5/auto/W83.java
index 7de5912b94e..dea4e765e40 100644
--- a/jdk/test/sun/security/krb5/auto/W83.java
+++ b/jdk/test/sun/security/krb5/auto/W83.java
@@ -26,13 +26,6 @@
* @bug 6932525 6951366 6959292
* @summary kerberos login failure on win2008 with AD set to win2000 compat mode
* and cannot login if session key and preauth does not use the same etype
- * @modules java.base/sun.net.spi.nameservice
- * java.base/sun.security.util
- * java.security.jgss/sun.security.krb5
- * java.security.jgss/sun.security.krb5.internal
- * java.security.jgss/sun.security.krb5.internal.ccache
- * java.security.jgss/sun.security.krb5.internal.crypto
- * java.security.jgss/sun.security.krb5.internal.ktab
* @run main/othervm -D6932525 W83
* @run main/othervm -D6959292 W83
*/
diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java b/jdk/test/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java
new file mode 100644
index 00000000000..262e1da189b
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8075301
+ * @library /sun/security/krb5/auto
+ * @summary New test for sun.security.krb5.principal system property.
+ * The principal can set using the system property sun.security.krb5.principal.
+ * This property is checked during login. If this property is not set,
+ * then the principal name from the configuration is used.
+ * @run main/othervm/java.security.policy=principalSystemPropTest.policy
+ * PrincipalSystemPropTest
+ */
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.login.LoginContext;
+import com.sun.security.auth.callback.TextCallbackHandler;
+
+public class PrincipalSystemPropTest {
+
+ private static final boolean PASS = Boolean.TRUE;
+ private static final boolean FAIL = Boolean.FALSE;
+ private static final String VALID_PRINCIPAL_JAAS_ENTRY =
+ "ValidPrincipalSystemPropTest";
+ private static final String INVALID_PRINCIPAL_JAAS_ENTRY =
+ "InvalidPrincipalSystemPropTest";
+ private static final String NO_PRINCIPAL_JAAS_ENTRY =
+ "NoPrincipalSystemPropTest";
+ private static final String SAME_PRINCIPAL_JAAS_ENTRY =
+ "SelfPrincipalSystemPropTest";
+ private static final String HOST = "localhost";
+ private static final String KTAB_FILENAME = "krb5.keytab.data";
+ private static final String REALM = "TEST.REALM";
+ private static final String TEST_SRC = System.getProperty("test.src", ".");
+ private static final String USER = "USER";
+ private static final String AVAILABLE_USER = "AVAILABLE";
+ private static final String USER_PASSWORD = "password";
+ private static final String FS = System.getProperty("file.separator");
+ private static final String KRB5_CONF_FILENAME = "krb5.conf";
+ private static final String JAAS_CONF_FILENAME = "jaas.conf";
+ private static final String KRBTGT_PRINCIPAL = "krbtgt/" + REALM;
+ private static final String USER_PRINCIPAL = USER + "@" + REALM;
+ private static final String AVAILABLE_USER_PRINCIPAL =
+ AVAILABLE_USER + "@" + REALM;
+
+ public static void main(String[] args) throws Exception {
+
+ setupTest();
+
+ // Expected result, Jaas Config Entry, Login Principal Expected,
+ // Principal passed through System property
+ runTest(PASS, VALID_PRINCIPAL_JAAS_ENTRY,
+ USER_PRINCIPAL, "USER@TEST.REALM");
+ runTest(PASS, VALID_PRINCIPAL_JAAS_ENTRY,
+ AVAILABLE_USER_PRINCIPAL, null);
+ runTest(PASS, INVALID_PRINCIPAL_JAAS_ENTRY,
+ USER_PRINCIPAL, "USER@TEST.REALM");
+ runTest(FAIL, INVALID_PRINCIPAL_JAAS_ENTRY, null, null);
+ runTest(PASS, NO_PRINCIPAL_JAAS_ENTRY,
+ USER_PRINCIPAL, "USER@TEST.REALM");
+ runTest(FAIL, NO_PRINCIPAL_JAAS_ENTRY, null, null);
+ runTest(PASS, SAME_PRINCIPAL_JAAS_ENTRY,
+ USER_PRINCIPAL, "USER@TEST.REALM");
+
+ }
+
+ private static void setupTest() {
+
+ System.setProperty("java.security.krb5.conf", KRB5_CONF_FILENAME);
+ System.setProperty("java.security.auth.login.config",
+ TEST_SRC + FS + JAAS_CONF_FILENAME);
+
+ Map principals = new HashMap<>();
+ principals.put(USER_PRINCIPAL, USER_PASSWORD);
+ principals.put(AVAILABLE_USER_PRINCIPAL, USER_PASSWORD);
+ principals.put(KRBTGT_PRINCIPAL, null);
+ KDC.startKDC(HOST, KRB5_CONF_FILENAME, REALM, principals,
+ KTAB_FILENAME, KDC.KtabMode.APPEND);
+
+ }
+
+ private static void runTest(boolean expected, String jaasConfigEntry,
+ String expectedLoginUser, String loginUserBySysProp) {
+
+ if(loginUserBySysProp != null) {
+ System.setProperty("sun.security.krb5.principal",
+ loginUserBySysProp);
+ } else {
+ System.clearProperty("sun.security.krb5.principal");
+ }
+
+ try {
+ LoginContext lc = new LoginContext(jaasConfigEntry,
+ new TextCallbackHandler());
+ lc.login();
+ System.out.println(String.format(
+ "Authentication completed with Subject '%s' ",
+ lc.getSubject()));
+
+ if (!expected) {
+ throw new RuntimeException(
+ "TEST FAILED - JAAS login success isn't expected");
+ }
+ if(expectedLoginUser != null && !lc.getSubject().getPrincipals()
+ .stream().map(p -> p.getName()).filter(
+ expectedLoginUser :: equals).findFirst()
+ .isPresent()) {
+ throw new RuntimeException(String.format(
+ "TEST FAILED - Login principal is not matched "
+ + "to expected principal '%s'.", expectedLoginUser));
+ }
+ System.out.println(
+ "TEST PASSED - JAAS login success is expected.");
+ } catch (LoginException ie) {
+ System.out.println(String.format(
+ "Authentication failed with exception: %s",
+ ie.getMessage()));
+ if (expected) {
+ System.out.println(
+ "TEST FAILED - JAAS login failure isn't expected");
+ throw new RuntimeException(ie);
+ }
+ System.out.println(
+ "TEST PASSED - JAAS login failure is expected.");
+ }
+
+ }
+
+}
diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/jaas.conf b/jdk/test/sun/security/krb5/auto/principalProperty/jaas.conf
new file mode 100644
index 00000000000..0a5b794e9e2
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/principalProperty/jaas.conf
@@ -0,0 +1,34 @@
+NoPrincipalSystemPropTest {
+ com.sun.security.auth.module.Krb5LoginModule required
+ useKeyTab = true
+ keyTab = krb5.keytab.data
+ doNotPrompt =true
+ debug=true;
+};
+
+InvalidPrincipalSystemPropTest {
+ com.sun.security.auth.module.Krb5LoginModule required
+ principal="UNAVAILABLE@TEST.REALM"
+ useKeyTab = true
+ keyTab = krb5.keytab.data
+ doNotPrompt =true
+ debug=true;
+};
+
+ValidPrincipalSystemPropTest {
+ com.sun.security.auth.module.Krb5LoginModule required
+ principal="AVAILABLE@TEST.REALM"
+ useKeyTab = true
+ keyTab = krb5.keytab.data
+ doNotPrompt =true
+ debug=true;
+};
+
+SelfPrincipalSystemPropTest {
+ com.sun.security.auth.module.Krb5LoginModule required
+ principal="USER@TEST.REALM"
+ useKeyTab = true
+ keyTab = krb5.keytab.data
+ doNotPrompt =true
+ debug=true;
+};
diff --git a/jdk/test/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy b/jdk/test/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy
new file mode 100644
index 00000000000..ac9ef4861c1
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/principalProperty/principalSystemPropTest.policy
@@ -0,0 +1,21 @@
+grant {
+ permission javax.security.auth.AuthPermission
+ "createLoginContext.ValidPrincipalSystemPropTest";
+ permission javax.security.auth.AuthPermission
+ "createLoginContext.InvalidPrincipalSystemPropTest";
+ permission javax.security.auth.AuthPermission
+ "createLoginContext.NoPrincipalSystemPropTest";
+ permission javax.security.auth.AuthPermission
+ "createLoginContext.SelfPrincipalSystemPropTest";
+ permission javax.security.auth.AuthPermission "doAs";
+ permission javax.security.auth.AuthPermission "modifyPrincipals";
+ permission javax.security.auth.AuthPermission "getSubject";
+ permission java.util.PropertyPermission "*", "read,write";
+ permission java.io.FilePermission "*", "read,write,delete";
+ permission java.lang.RuntimePermission "accessDeclaredMembers";
+ permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+ permission java.lang.RuntimePermission "accessClassInPackage.*";
+ permission java.net.SocketPermission "*:*",
+ "listen,resolve,accept,connect";
+};
+
diff --git a/jdk/test/sun/security/krb5/config/NamingManager.java b/jdk/test/sun/security/krb5/config/NamingManager.java
index 47f4f412deb..93f0762f130 100644
--- a/jdk/test/sun/security/krb5/config/NamingManager.java
+++ b/jdk/test/sun/security/krb5/config/NamingManager.java
@@ -23,7 +23,6 @@
package javax.naming.spi;
-import com.sun.jndi.dns.DnsContext;
import java.util.Hashtable;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -31,6 +30,7 @@ import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.InitialDirContext;
/**
* A fake javax.naming.spi.NamingManager. It allows reading a DNS
@@ -43,7 +43,7 @@ public class NamingManager {
public static Context getURLContext(
String scheme, Hashtable environment)
throws NamingException {
- return new DnsContext("", null, new Hashtable()) {
+ return new InitialDirContext() {
public Attributes getAttributes(String name, String[] attrIds)
throws NamingException {
return new BasicAttributes() {
diff --git a/jdk/test/sun/security/krb5/tools/KtabZero.java b/jdk/test/sun/security/krb5/tools/KtabZero.java
index bc1b1d32b8f..6cc2a527380 100644
--- a/jdk/test/sun/security/krb5/tools/KtabZero.java
+++ b/jdk/test/sun/security/krb5/tools/KtabZero.java
@@ -33,7 +33,9 @@ import java.nio.file.Paths;
* @test
* @bug 8014196
* @summary ktab creates a file with zero kt_vno
+ * @requires os.family == "windows"
* @modules java.security.jgss/sun.security.krb5.internal.ktab
+ * java.security.jgss/sun.security.krb5.internal.tools
*/
public class KtabZero {
@@ -52,15 +54,8 @@ public class KtabZero {
// 2. Create with the tool
Files.deleteIfExists(Paths.get(NAME));
- try {
- Class ktab = Class.forName("sun.security.krb5.internal.tools.Ktab");
- ktab.getDeclaredMethod("main", String[].class).invoke(null,
- (Object)(("-k " + NAME + " -a me@HERE pass").split(" ")));
- } catch (ClassNotFoundException cnfe) {
- // Only Windows has ktab tool
- System.out.println("No ktab tool here. Ignored.");
- return;
- }
+ sun.security.krb5.internal.tools.Ktab.main(
+ ("-k " + NAME + " -a me@HERE pass").split(" "));
check(false);
}
diff --git a/jdk/test/sun/security/util/Oid/OidEquals.java b/jdk/test/sun/security/util/Oid/OidEquals.java
new file mode 100644
index 00000000000..1682fc3a0d1
--- /dev/null
+++ b/jdk/test/sun/security/util/Oid/OidEquals.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8022444
+ * @summary Test ObjectIdentifier.equals(Object obj)
+ */
+
+import sun.security.util.ObjectIdentifier;
+
+public class OidEquals {
+ public static void main(String[] args) throws Exception {
+ ObjectIdentifier oid1 = new ObjectIdentifier("1.3.6.1.4.1.42.2.17");
+ ObjectIdentifier oid2 =
+ new ObjectIdentifier(new int[]{1, 3, 6, 1, 4, 1, 42, 2, 17});
+ ObjectIdentifier oid3 = new ObjectIdentifier("1.2.3.4");
+
+ assertEquals(oid1, oid1);
+ assertEquals(oid1, oid2);
+ assertNotEquals(oid1, oid3);
+ assertNotEquals(oid1, "1.3.6.1.4.1.42.2.17");
+
+ System.out.println("Tests passed.");
+ }
+
+ static void assertEquals(ObjectIdentifier oid, Object obj)
+ throws Exception {
+ if (!oid.equals(obj)) {
+ throw new Exception("The ObjectIdentifier " + oid.toString() +
+ " should be equal to the Object " + obj.toString());
+ }
+ }
+
+ static void assertNotEquals(ObjectIdentifier oid, Object obj)
+ throws Exception {
+ if (oid.equals(obj)) {
+ throw new Exception("The ObjectIdentifier " + oid.toString() +
+ " should not be equal to the Object " + obj.toString());
+ }
+ }
+}
diff --git a/jdk/test/sun/security/util/Oid/OidFormat.java b/jdk/test/sun/security/util/Oid/OidFormat.java
index d7aab146c82..48dd2f925bc 100644
--- a/jdk/test/sun/security/util/Oid/OidFormat.java
+++ b/jdk/test/sun/security/util/Oid/OidFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -129,7 +129,7 @@ public class OidFormat {
os.putOID(oid);
DerInputStream is = new DerInputStream(os.toByteArray());
ObjectIdentifier oid2 = is.getOID();
- if (!oid.equals((Object)oid2)) {
+ if (!oid.equals(oid2)) {
throw new Exception("Test DER I/O fails: " + oid + " and " + oid2);
}
}
@@ -144,7 +144,7 @@ public class OidFormat {
os.putOID(oid);
DerInputStream is = new DerInputStream(os.toByteArray());
ObjectIdentifier oid2 = is.getOID();
- if (!oid.equals((Object)oid2)) {
+ if (!oid.equals(oid2)) {
throw new Exception("Test DER I/O fails: " + oid + " and " + oid2);
}
}
diff --git a/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java b/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java
index 049663c86ac..4558f3e346b 100644
--- a/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java
+++ b/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java
@@ -38,7 +38,7 @@ import jdk.testlibrary.Utils;
public class TmtoolTestScenario {
- private final ArrayList toolOutput = new ArrayList();
+ private final ArrayList toolOutput = new ArrayList();
private LingeredApp theApp = null;
private final String toolName;
private final String[] toolArgs;
@@ -72,7 +72,7 @@ public class TmtoolTestScenario {
*/
public Map parseFlagsFinal() {
List astr = theApp.getAppOutput();
- Map vmMap = new HashMap();
+ Map vmMap = new HashMap();
for (String line : astr) {
String[] lv = line.trim().split("\\s+");
@@ -94,7 +94,10 @@ public class TmtoolTestScenario {
System.out.println("Starting LingeredApp");
try {
try {
- theApp = LingeredApp.startApp(vmArgs);
+ List vmArgsExtended = new ArrayList();
+ vmArgsExtended.add("-XX:+UsePerfData");
+ vmArgsExtended.addAll(vmArgs);
+ theApp = LingeredApp.startApp(vmArgsExtended);
System.out.println("Starting " + toolName + " against " + theApp.getPid());
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(toolName);
@@ -120,7 +123,7 @@ public class TmtoolTestScenario {
return toolProcess.exitValue();
} finally {
- theApp.stopApp();
+ LingeredApp.stopApp(theApp);
}
} catch (IOException | InterruptedException ex) {
throw new RuntimeException("Test ERROR " + ex, ex);
diff --git a/jdk/test/sun/tools/jps/JpsHelper.java b/jdk/test/sun/tools/jps/JpsHelper.java
index a5882aee6db..214be820d13 100644
--- a/jdk/test/sun/tools/jps/JpsHelper.java
+++ b/jdk/test/sun/tools/jps/JpsHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -94,9 +94,10 @@ public final class JpsHelper {
}
/**
- * VM arguments to start test application with
+ * VM arguments to start test application with.
+ * -XX:+UsePerfData is required for running the tests on embedded platforms.
*/
- public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+PrintGCDetails"};
+ public static final String[] VM_ARGS = {"-XX:+UsePerfData", "-Xmx512m", "-XX:+PrintGCDetails"};
/**
* VM flag to start test application with
*/
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
index 19d5533385c..d6f6f158d1d 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2015d
+tzdata2015e
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/africa b/jdk/test/sun/util/calendar/zi/tzdata/africa
index 6099a70f5e6..049861192cc 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa
@@ -361,9 +361,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
# time this summer, and carry out studies on the possibility of canceling the
# practice altogether in future years."
#
-# From Paul Eggert (2015-04-20):
-# For now, assume DST will be canceled. Any resumption would likely
-# use different rules anyway.
+# From Paul Eggert (2015-04-24):
+# Yesterday the office of Egyptian President El-Sisi announced his
+# decision to abandon DST permanently. See Ahram Online 2015-04-24.
+# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
Rule Egypt 2008 only - Aug lastThu 24:00 0 -
Rule Egypt 2009 only - Aug 20 24:00 0 -
@@ -810,20 +811,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Paul Eggert (2014-06-05):
-# For now, guess that later spring and fall transitions will use 2014's rules,
+# From Milamber (2015-06-08):
+# (Google Translation) The hour will thus be delayed 60 minutes
+# Sunday, June 14 at 3:00, the ministry said in a statement, adding
+# that the time will be advanced again 60 minutes Sunday, July 19,
+# 2015 at 2:00. The move comes under 2.12.126 Decree of 26 Jumada I
+# 1433 (18 April 2012) and the decision of the Head of Government of
+# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
+# Source (french):
+# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+#
+# From Milamber (2015-06-09):
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
+#
+# From Michael Deckers (2015-06-09):
+# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
+# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
+# I think the patch is correct and the quoted text is wrong; the text in
+# descriptor (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;)V flags 1
+method name descriptor (Ljava/lang/Class;Ljava/lang/String;)V flags 1
+method name descriptor (Ljava/lang/String;Ljava/lang/String;)V flags 1
+method name getMimeType descriptor ()Ljava/lang/String; flags 1
+method name getRepresentationClass descriptor ()Ljava/lang/Class; flags 1
+method name getHumanPresentableName descriptor ()Ljava/lang/String; flags 1
+method name setHumanPresentableName descriptor (Ljava/lang/String;)V flags 1
+method name equals descriptor (Ljava/awt/datatransfer/DataFlavor;)Z flags 1
+method name isMimeTypeEqual descriptor (Ljava/lang/String;)Z flags 1
+method name normalizeMimeTypeParameter descriptor (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; flags 4 deprecated true
+method name normalizeMimeType descriptor (Ljava/lang/String;)Ljava/lang/String; flags 4 deprecated true
+
+class name javax/activation/CommandInfo
+header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor (Ljava/lang/String;Ljava/lang/String;)V flags 1
+method name getCommandName descriptor ()Ljava/lang/String; flags 1
+method name getCommandClass descriptor ()Ljava/lang/String; flags 1
+method name getCommandObject descriptor (Ljavax/activation/DataHandler;Ljava/lang/ClassLoader;)Ljava/lang/Object; thrownTypes java/io/IOException,java/lang/ClassNotFoundException flags 1
+
+class name javax/activation/CommandMap
+header extends java/lang/Object flags 421 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name getDefaultCommandMap descriptor ()Ljavax/activation/CommandMap; flags 9
+method name setDefaultCommandMap descriptor (Ljavax/activation/CommandMap;)V flags 9
+method name getPreferredCommands descriptor (Ljava/lang/String;)[Ljavax/activation/CommandInfo; flags 401
+method name getPreferredCommands descriptor (Ljava/lang/String;Ljavax/activation/DataSource;)[Ljavax/activation/CommandInfo; flags 1
+method name getAllCommands descriptor (Ljava/lang/String;)[Ljavax/activation/CommandInfo; flags 401
+method name getAllCommands descriptor (Ljava/lang/String;Ljavax/activation/DataSource;)[Ljavax/activation/CommandInfo; flags 1
+method name getCommand descriptor (Ljava/lang/String;Ljava/lang/String;)Ljavax/activation/CommandInfo; flags 401
+method name getCommand descriptor (Ljava/lang/String;Ljava/lang/String;Ljavax/activation/DataSource;)Ljavax/activation/CommandInfo; flags 1
+method name createDataContentHandler descriptor (Ljava/lang/String;)Ljavax/activation/DataContentHandler; flags 401
+method name createDataContentHandler descriptor (Ljava/lang/String;Ljavax/activation/DataSource;)Ljavax/activation/DataContentHandler; flags 1
+method name getMimeTypes descriptor ()[Ljava/lang/String; flags 1
+
+class name javax/activation/CommandObject
+header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name setCommandContext descriptor (Ljava/lang/String;Ljavax/activation/DataHandler;)V thrownTypes java/io/IOException flags 401
+
+class name javax/activation/DataContentHandler
+header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name getTransferDataFlavors descriptor ()[Ljava/awt/datatransfer/DataFlavor; flags 401
+method name getTransferData descriptor (Ljava/awt/datatransfer/DataFlavor;Ljavax/activation/DataSource;)Ljava/lang/Object; thrownTypes java/awt/datatransfer/UnsupportedFlavorException,java/io/IOException flags 401
+method name getContent descriptor (Ljavax/activation/DataSource;)Ljava/lang/Object; thrownTypes java/io/IOException flags 401
+method name writeTo descriptor (Ljava/lang/Object;Ljava/lang/String;Ljava/io/OutputStream;)V thrownTypes java/io/IOException flags 401
+
+class name javax/activation/DataContentHandlerFactory
+header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name createDataContentHandler descriptor (Ljava/lang/String;)Ljavax/activation/DataContentHandler; flags 401
+
+class name javax/activation/DataHandler
+header extends java/lang/Object implements java/awt/datatransfer/Transferable flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor (Ljavax/activation/DataSource;)V flags 1
+method name descriptor (Ljava/lang/Object;Ljava/lang/String;)V flags 1
+method name descriptor (Ljava/net/URL;)V flags 1
+method name getDataSource descriptor ()Ljavax/activation/DataSource; flags 1
+method name getName descriptor ()Ljava/lang/String; flags 1
+method name getContentType descriptor ()Ljava/lang/String; flags 1
+method name getInputStream descriptor ()Ljava/io/InputStream; thrownTypes java/io/IOException flags 1
+method name writeTo descriptor (Ljava/io/OutputStream;)V thrownTypes java/io/IOException flags 1
+method name getOutputStream descriptor ()Ljava/io/OutputStream; thrownTypes java/io/IOException flags 1
+method name getTransferDataFlavors descriptor ()[Ljava/awt/datatransfer/DataFlavor; flags 21
+method name isDataFlavorSupported descriptor (Ljava/awt/datatransfer/DataFlavor;)Z flags 1
+method name getTransferData descriptor (Ljava/awt/datatransfer/DataFlavor;)Ljava/lang/Object; thrownTypes java/awt/datatransfer/UnsupportedFlavorException,java/io/IOException flags 1
+method name setCommandMap descriptor (Ljavax/activation/CommandMap;)V flags 21
+method name getPreferredCommands descriptor ()[Ljavax/activation/CommandInfo; flags 1
+method name getAllCommands descriptor ()[Ljavax/activation/CommandInfo; flags 1
+method name getCommand descriptor (Ljava/lang/String;)Ljavax/activation/CommandInfo; flags 1
+method name getContent descriptor ()Ljava/lang/Object; thrownTypes java/io/IOException flags 1
+method name getBean descriptor (Ljavax/activation/CommandInfo;)Ljava/lang/Object; flags 1
+method name setDataContentHandlerFactory descriptor (Ljavax/activation/DataContentHandlerFactory;)V flags 29
+
+class name javax/activation/DataSource
+header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name getInputStream descriptor ()Ljava/io/InputStream; thrownTypes java/io/IOException flags 401
+method name getOutputStream descriptor ()Ljava/io/OutputStream; thrownTypes java/io/IOException flags 401
+method name getContentType descriptor ()Ljava/lang/String; flags 401
+method name getName descriptor ()Ljava/lang/String; flags 401
+
+class name javax/activation/FileDataSource
+header extends java/lang/Object implements javax/activation/DataSource flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor (Ljava/io/File;)V flags 1
+method name descriptor (Ljava/lang/String;)V flags 1
+method name getInputStream descriptor ()Ljava/io/InputStream; thrownTypes java/io/IOException flags 1
+method name getOutputStream descriptor ()Ljava/io/OutputStream; thrownTypes java/io/IOException flags 1
+method name getContentType descriptor ()Ljava/lang/String; flags 1
+method name getName descriptor ()Ljava/lang/String; flags 1
+method name getFile descriptor ()Ljava/io/File; flags 1
+method name setFileTypeMap descriptor (Ljavax/activation/FileTypeMap;)V flags 1
+
+class name javax/activation/FileTypeMap
+header extends java/lang/Object flags 421 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name getContentType descriptor (Ljava/io/File;)Ljava/lang/String; flags 401
+method name getContentType descriptor (Ljava/lang/String;)Ljava/lang/String; flags 401
+method name setDefaultFileTypeMap descriptor (Ljavax/activation/FileTypeMap;)V flags 9
+method name getDefaultFileTypeMap descriptor ()Ljavax/activation/FileTypeMap; flags 9
+
+class name javax/activation/MailcapCommandMap
+header extends javax/activation/CommandMap flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V thrownTypes java/io/IOException flags 1
+method name descriptor (Ljava/io/InputStream;)V flags 1
+method name getPreferredCommands descriptor (Ljava/lang/String;)[Ljavax/activation/CommandInfo; flags 21
+method name getAllCommands descriptor (Ljava/lang/String;)[Ljavax/activation/CommandInfo; flags 21
+method name getCommand descriptor (Ljava/lang/String;Ljava/lang/String;)Ljavax/activation/CommandInfo; flags 21
+method name addMailcap descriptor (Ljava/lang/String;)V flags 21
+method name createDataContentHandler descriptor (Ljava/lang/String;)Ljavax/activation/DataContentHandler; flags 21
+method name getMimeTypes descriptor ()[Ljava/lang/String; flags 21
+method name getNativeCommands descriptor (Ljava/lang/String;)[Ljava/lang/String; flags 21
+
+class name javax/activation/MimeType
+header extends java/lang/Object implements java/io/Externalizable flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 1
+method name descriptor (Ljava/lang/String;Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 1
+method name getPrimaryType descriptor ()Ljava/lang/String; flags 1
+method name setPrimaryType descriptor (Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 1
+method name getSubType descriptor ()Ljava/lang/String; flags 1
+method name setSubType descriptor (Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 1
+method name getParameters descriptor ()Ljavax/activation/MimeTypeParameterList; flags 1
+method name getParameter descriptor (Ljava/lang/String;)Ljava/lang/String; flags 1
+method name setParameter descriptor (Ljava/lang/String;Ljava/lang/String;)V flags 1
+method name removeParameter descriptor (Ljava/lang/String;)V flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+method name getBaseType descriptor ()Ljava/lang/String; flags 1
+method name match descriptor (Ljavax/activation/MimeType;)Z flags 1
+method name match descriptor (Ljava/lang/String;)Z thrownTypes javax/activation/MimeTypeParseException flags 1
+method name writeExternal descriptor (Ljava/io/ObjectOutput;)V thrownTypes java/io/IOException flags 1
+method name readExternal descriptor (Ljava/io/ObjectInput;)V thrownTypes java/io/IOException,java/lang/ClassNotFoundException flags 1
+
+class name javax/activation/MimeTypeParameterList
+header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 1
+method name parse descriptor (Ljava/lang/String;)V thrownTypes javax/activation/MimeTypeParseException flags 4
+method name size descriptor ()I flags 1
+method name isEmpty descriptor ()Z flags 1
+method name get descriptor (Ljava/lang/String;)Ljava/lang/String; flags 1
+method name set descriptor (Ljava/lang/String;Ljava/lang/String;)V flags 1
+method name remove descriptor (Ljava/lang/String;)V flags 1
+method name getNames descriptor ()Ljava/util/Enumeration; flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+
+class name javax/activation/MimeTypeParseException
+header extends java/lang/Exception flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V flags 1
+
+class name javax/activation/MimetypesFileTypeMap
+header extends javax/activation/FileTypeMap flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V thrownTypes java/io/IOException flags 1
+method name descriptor (Ljava/io/InputStream;)V flags 1
+method name addMimeTypes descriptor (Ljava/lang/String;)V flags 21
+method name getContentType descriptor (Ljava/io/File;)Ljava/lang/String; flags 1
+method name getContentType descriptor (Ljava/lang/String;)Ljava/lang/String; flags 21
+
+class name javax/activation/URLDataSource
+header extends java/lang/Object implements javax/activation/DataSource flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor (Ljava/net/URL;)V flags 1
+method name getContentType descriptor ()Ljava/lang/String; flags 1
+method name getName descriptor ()Ljava/lang/String; flags 1
+method name getInputStream descriptor ()Ljava/io/InputStream; thrownTypes java/io/IOException flags 1
+method name getOutputStream descriptor ()Ljava/io/OutputStream; thrownTypes java/io/IOException flags 1
+method name getURL descriptor ()Ljava/net/URL; flags 1
+
+class name javax/activation/UnsupportedDataTypeException
+header extends java/io/IOException flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
+method name descriptor ()V flags 1
+method name descriptor (Ljava/lang/String;)V flags 1
+
diff --git a/langtools/make/data/symbols/java.annotations.common-6.sym.txt b/langtools/make/data/symbols/java.annotations.common-6.sym.txt
new file mode 100644
index 00000000000..d7ce1acc720
--- /dev/null
+++ b/langtools/make/data/symbols/java.annotations.common-6.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/annotation/Resource
+-method name lookup descriptor ()Ljava/lang/String;
+
diff --git a/langtools/make/data/symbols/java.annotations.common-7.sym.txt b/langtools/make/data/symbols/java.annotations.common-7.sym.txt
new file mode 100644
index 00000000000..e45463911b9
--- /dev/null
+++ b/langtools/make/data/symbols/java.annotations.common-7.sym.txt
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/annotation/Generated
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;ANNOTATION_TYPE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;PARAMETER;})
+
+class name javax/annotation/PostConstruct
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})
+
+class name javax/annotation/PreDestroy
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})
+
+class name javax/annotation/Resource
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;METHOD;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
+innerclass innerClass javax/annotation/Resource$AuthenticationType outerClass javax/annotation/Resource innerClassName AuthenticationType flags 4019
+-method name type descriptor ()Ljava/lang/Class;
+method name type descriptor ()Ljava/lang/Class; annotationDefaultValue cLjava/lang/Object; flags 401
+
+class name javax/annotation/Resources
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;})
+
diff --git a/langtools/make/data/symbols/java.annotations.common-8.sym.txt b/langtools/make/data/symbols/java.annotations.common-8.sym.txt
new file mode 100644
index 00000000000..443485e19aa
--- /dev/null
+++ b/langtools/make/data/symbols/java.annotations.common-8.sym.txt
@@ -0,0 +1,63 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/annotation/Generated
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 classAnnotations @Ljdk/Profile+Annotation;(value=I4) runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;ANNOTATION_TYPE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;PARAMETER;})
+method name value descriptor ()[Ljava/lang/String; flags 401
+method name date descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+method name comments descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+
+class name javax/annotation/PostConstruct
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 classAnnotations @Ljdk/Profile+Annotation;(value=I4) runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})
+
+class name javax/annotation/PreDestroy
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 classAnnotations @Ljdk/Profile+Annotation;(value=I4) runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})
+
+class name javax/annotation/Resource
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 classAnnotations @Ljdk/Profile+Annotation;(value=I4) runtimeAnnotations @Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;METHOD;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
+innerclass innerClass javax/annotation/Resource$AuthenticationType outerClass javax/annotation/Resource innerClassName AuthenticationType flags 4019
+method name name descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+method name lookup descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+method name type descriptor ()Ljava/lang/Class; annotationDefaultValue cLjava/lang/Object; flags 401 signature ()Ljava/lang/Class<*>;
+method name authenticationType descriptor ()Ljavax/annotation/Resource$AuthenticationType; annotationDefaultValue eLjavax/annotation/Resource$AuthenticationType;CONTAINER; flags 401
+method name shareable descriptor ()Z annotationDefaultValue Ztrue flags 401
+method name mappedName descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+method name description descriptor ()Ljava/lang/String; annotationDefaultValue "" flags 401
+
+class name javax/annotation/Resource$AuthenticationType
+header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum;
+innerclass innerClass javax/annotation/Resource$AuthenticationType outerClass javax/annotation/Resource innerClassName AuthenticationType flags 4019
+field name CONTAINER descriptor Ljavax/annotation/Resource$AuthenticationType; flags 4019
+field name APPLICATION descriptor Ljavax/annotation/Resource$AuthenticationType; flags 4019
+method name values descriptor ()[Ljavax/annotation/Resource$AuthenticationType; flags 9
+method name valueOf descriptor (Ljava/lang/String;)Ljavax/annotation/Resource$AuthenticationType; flags 9
+
+class name javax/annotation/Resources
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 classAnnotations @Ljdk/Profile+Annotation;(value=I4) runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;})
+method name value descriptor ()[Ljavax/annotation/Resource; flags 401
+
diff --git a/langtools/make/data/symbols/java.base-6.sym.txt b/langtools/make/data/symbols/java.base-6.sym.txt
new file mode 100644
index 00000000000..1e87a66398e
--- /dev/null
+++ b/langtools/make/data/symbols/java.base-6.sym.txt
@@ -0,0 +1,890 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/io/Closeable
+header extends java/lang/Object flags 601
+
+class name java/io/File
+-method name toPath descriptor ()Ljava/nio/file/Path;
+
+class name java/io/FileOutputStream
+-method name write descriptor (I)V
+method name write descriptor (I)V thrownTypes java/io/IOException flags 101
+
+class name java/io/ObjectInput
+header extends java/lang/Object implements java/io/DataInput flags 601
+
+class name java/io/ObjectOutput
+header extends java/lang/Object implements java/io/DataOutput flags 601
+
+class name java/lang/AssertionError
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;)V
+
+-class name java/lang/AutoCloseable
+
+class name java/lang/Boolean
+-method name compare descriptor (ZZ)I
+
+-class name java/lang/BootstrapMethodError
+
+class name java/lang/Byte
+-method name compare descriptor (BB)I
+
+class name java/lang/Character
+header extends java/lang/Object implements java/io/Serializable,java/lang/Comparable flags 31 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable;
+innerclass innerClass java/lang/Character$Subset outerClass java/lang/Character innerClassName Subset flags 9
+innerclass innerClass java/lang/Character$UnicodeBlock outerClass java/lang/Character innerClassName UnicodeBlock flags 19
+-method name isBmpCodePoint descriptor (I)Z
+-method name isSurrogate descriptor (C)Z
+-method name highSurrogate descriptor (I)C
+-method name lowSurrogate descriptor (I)C
+-method name isAlphabetic descriptor (I)Z
+-method name isIdeographic descriptor (I)Z
+-method name compare descriptor (CC)I
+-method name getName descriptor (I)Ljava/lang/String;
+
+class name java/lang/Character$UnicodeBlock
+-field name ARABIC_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name NKO descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SAMARITAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MANDAIC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ETHIOPIC_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED descriptor Ljava/lang/Character$UnicodeBlock;
+-field name NEW_TAI_LUE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BUGINESE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name TAI_THAM descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BALINESE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SUNDANESE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BATAK descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LEPCHA descriptor Ljava/lang/Character$UnicodeBlock;
+-field name OL_CHIKI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name VEDIC_EXTENSIONS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name PHONETIC_EXTENSIONS_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name COMBINING_DIACRITICAL_MARKS_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name GLAGOLITIC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LATIN_EXTENDED_C descriptor Ljava/lang/Character$UnicodeBlock;
+-field name COPTIC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name GEORGIAN_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name TIFINAGH descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ETHIOPIC_EXTENDED descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CYRILLIC_EXTENDED_A descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SUPPLEMENTAL_PUNCTUATION descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CJK_STROKES descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LISU descriptor Ljava/lang/Character$UnicodeBlock;
+-field name VAI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CYRILLIC_EXTENDED_B descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BAMUM descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MODIFIER_TONE_LETTERS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LATIN_EXTENDED_D descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SYLOTI_NAGRI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name COMMON_INDIC_NUMBER_FORMS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name PHAGS_PA descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SAURASHTRA descriptor Ljava/lang/Character$UnicodeBlock;
+-field name DEVANAGARI_EXTENDED descriptor Ljava/lang/Character$UnicodeBlock;
+-field name KAYAH_LI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name REJANG descriptor Ljava/lang/Character$UnicodeBlock;
+-field name HANGUL_JAMO_EXTENDED_A descriptor Ljava/lang/Character$UnicodeBlock;
+-field name JAVANESE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CHAM descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MYANMAR_EXTENDED_A descriptor Ljava/lang/Character$UnicodeBlock;
+-field name TAI_VIET descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ETHIOPIC_EXTENDED_A descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MEETEI_MAYEK descriptor Ljava/lang/Character$UnicodeBlock;
+-field name HANGUL_JAMO_EXTENDED_B descriptor Ljava/lang/Character$UnicodeBlock;
+-field name VERTICAL_FORMS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ANCIENT_GREEK_NUMBERS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ANCIENT_SYMBOLS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name PHAISTOS_DISC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LYCIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CARIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name OLD_PERSIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name IMPERIAL_ARAMAIC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name PHOENICIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name LYDIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name KHAROSHTHI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name OLD_SOUTH_ARABIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name AVESTAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name INSCRIPTIONAL_PARTHIAN descriptor Ljava/lang/Character$UnicodeBlock;
+-field name INSCRIPTIONAL_PAHLAVI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name OLD_TURKIC descriptor Ljava/lang/Character$UnicodeBlock;
+-field name RUMI_NUMERAL_SYMBOLS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BRAHMI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name KAITHI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CUNEIFORM descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CUNEIFORM_NUMBERS_AND_PUNCTUATION descriptor Ljava/lang/Character$UnicodeBlock;
+-field name EGYPTIAN_HIEROGLYPHS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name BAMUM_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name KANA_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ANCIENT_GREEK_MUSICAL_NOTATION descriptor Ljava/lang/Character$UnicodeBlock;
+-field name COUNTING_ROD_NUMERALS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MAHJONG_TILES descriptor Ljava/lang/Character$UnicodeBlock;
+-field name DOMINO_TILES descriptor Ljava/lang/Character$UnicodeBlock;
+-field name PLAYING_CARDS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ENCLOSED_ALPHANUMERIC_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ENCLOSED_IDEOGRAPHIC_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name EMOTICONS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name TRANSPORT_AND_MAP_SYMBOLS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ALCHEMICAL_SYMBOLS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D descriptor Ljava/lang/Character$UnicodeBlock;
+
+-class name java/lang/Character$UnicodeScript
+
+class name java/lang/ClassLoader
+-method name loadClass descriptor (Ljava/lang/String;Z)Ljava/lang/Class;
+-method name getClassLoadingLock descriptor (Ljava/lang/String;)Ljava/lang/Object;
+-method name setDefaultAssertionStatus descriptor (Z)V
+-method name setPackageAssertionStatus descriptor (Ljava/lang/String;Z)V
+-method name setClassAssertionStatus descriptor (Ljava/lang/String;Z)V
+-method name clearAssertionStatus descriptor ()V
+-method name registerAsParallelCapable descriptor ()Z
+method name loadClass descriptor (Ljava/lang/String;Z)Ljava/lang/Class; thrownTypes java/lang/ClassNotFoundException flags 24 signature (Ljava/lang/String;Z)Ljava/lang/Class<*>;
+method name setDefaultAssertionStatus descriptor (Z)V flags 21
+method name setPackageAssertionStatus descriptor (Ljava/lang/String;Z)V flags 21
+method name setClassAssertionStatus descriptor (Ljava/lang/String;Z)V flags 21
+method name clearAssertionStatus descriptor ()V flags 21
+
+class name java/lang/ClassNotFoundException
+header extends java/lang/Exception flags 21
+
+-class name java/lang/ClassValue
+
+class name java/lang/Deprecated
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
+
+class name java/lang/Error
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;ZZ)V
+
+class name java/lang/Exception
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;ZZ)V
+
+class name java/lang/IllegalAccessException
+header extends java/lang/Exception flags 21
+
+class name java/lang/InstantiationException
+header extends java/lang/Exception flags 21
+
+class name java/lang/Integer
+-method name compare descriptor (II)I
+
+class name java/lang/LinkageError
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;)V
+
+class name java/lang/Long
+-method name compare descriptor (JJ)I
+
+class name java/lang/NoSuchFieldException
+header extends java/lang/Exception flags 21
+
+class name java/lang/NoSuchMethodException
+header extends java/lang/Exception flags 21
+
+class name java/lang/ProcessBuilder
+header extends java/lang/Object flags 31
+-method name redirectInput descriptor (Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;
+-method name redirectOutput descriptor (Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;
+-method name redirectError descriptor (Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;
+-method name redirectInput descriptor (Ljava/io/File;)Ljava/lang/ProcessBuilder;
+-method name redirectOutput descriptor (Ljava/io/File;)Ljava/lang/ProcessBuilder;
+-method name redirectError descriptor (Ljava/io/File;)Ljava/lang/ProcessBuilder;
+-method name redirectInput descriptor ()Ljava/lang/ProcessBuilder$Redirect;
+-method name redirectOutput descriptor ()Ljava/lang/ProcessBuilder$Redirect;
+-method name redirectError descriptor ()Ljava/lang/ProcessBuilder$Redirect;
+-method name inheritIO descriptor ()Ljava/lang/ProcessBuilder;
+
+-class name java/lang/ProcessBuilder$Redirect
+
+-class name java/lang/ProcessBuilder$Redirect$Type
+
+-class name java/lang/ReflectiveOperationException
+
+class name java/lang/RuntimeException
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;ZZ)V
+
+-class name java/lang/SafeVarargs
+
+class name java/lang/Short
+-method name compare descriptor (SS)I
+
+class name java/lang/StrictMath
+-method name ceil descriptor (D)D
+-method name floor descriptor (D)D
+method name ceil descriptor (D)D flags 109
+method name floor descriptor (D)D flags 109
+
+class name java/lang/System
+-method name lineSeparator descriptor ()Ljava/lang/String;
+
+class name java/lang/Thread
+-method name clone descriptor ()Ljava/lang/Object;
+
+class name java/lang/Throwable
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;ZZ)V
+-method name getCause descriptor ()Ljava/lang/Throwable;
+-method name fillInStackTrace descriptor ()Ljava/lang/Throwable;
+-method name addSuppressed descriptor (Ljava/lang/Throwable;)V
+-method name getSuppressed descriptor ()[Ljava/lang/Throwable;
+method name getCause descriptor ()Ljava/lang/Throwable; flags 1
+method name fillInStackTrace descriptor ()Ljava/lang/Throwable; flags 121
+
+-class name java/lang/invoke/CallSite
+
+-class name java/lang/invoke/ConstantCallSite
+
+-class name java/lang/invoke/MethodHandle
+
+-class name java/lang/invoke/MethodHandleProxies
+
+-class name java/lang/invoke/MethodHandles
+
+-class name java/lang/invoke/MethodHandles$Lookup
+
+-class name java/lang/invoke/MethodType
+
+-class name java/lang/invoke/MutableCallSite
+
+-class name java/lang/invoke/SwitchPoint
+
+-class name java/lang/invoke/VolatileCallSite
+
+-class name java/lang/invoke/WrongMethodTypeException
+
+class name java/lang/reflect/InvocationTargetException
+header extends java/lang/Exception flags 21
+
+class name java/lang/reflect/Modifier
+-method name classModifiers descriptor ()I
+-method name interfaceModifiers descriptor ()I
+-method name constructorModifiers descriptor ()I
+-method name methodModifiers descriptor ()I
+-method name fieldModifiers descriptor ()I
+
+class name java/net/DatagramSocket
+header extends java/lang/Object flags 21
+
+class name java/net/HttpCookie
+-method name isHttpOnly descriptor ()Z
+-method name setHttpOnly descriptor (Z)V
+
+class name java/net/HttpURLConnection
+-field name fixedContentLengthLong descriptor J
+-method name setFixedLengthStreamingMode descriptor (J)V
+
+class name java/net/InetAddress
+-method name getLoopbackAddress descriptor ()Ljava/net/InetAddress;
+
+class name java/net/InetSocketAddress
+-method name getHostString descriptor ()Ljava/lang/String;
+
+class name java/net/NetworkInterface
+-method name getIndex descriptor ()I
+-method name getByIndex descriptor (I)Ljava/net/NetworkInterface;
+
+-class name java/net/ProtocolFamily
+
+class name java/net/ServerSocket
+header extends java/lang/Object flags 21
+
+class name java/net/Socket
+header extends java/lang/Object flags 21
+
+-class name java/net/SocketOption
+
+-class name java/net/StandardProtocolFamily
+
+-class name java/net/StandardSocketOptions
+
+class name java/net/URLClassLoader
+header extends java/security/SecureClassLoader flags 21
+-method name getResourceAsStream descriptor (Ljava/lang/String;)Ljava/io/InputStream;
+-method name close descriptor ()V
+
+class name java/net/URLConnection
+-method name getContentLengthLong descriptor ()J
+-method name getHeaderFieldLong descriptor (Ljava/lang/String;J)J
+
+class name java/nio/CharBuffer
+-method name subSequence descriptor (II)Ljava/nio/CharBuffer;
+-method name subSequence descriptor (II)Ljava/lang/CharSequence;
+method name subSequence descriptor (II)Ljava/lang/CharSequence; flags 401
+
+-class name java/nio/channels/AcceptPendingException
+
+-class name java/nio/channels/AlreadyBoundException
+
+-class name java/nio/channels/AsynchronousByteChannel
+
+-class name java/nio/channels/AsynchronousChannel
+
+-class name java/nio/channels/AsynchronousChannelGroup
+
+-class name java/nio/channels/AsynchronousFileChannel
+
+-class name java/nio/channels/AsynchronousServerSocketChannel
+
+-class name java/nio/channels/AsynchronousSocketChannel
+
+class name java/nio/channels/Channels
+-method name newInputStream descriptor (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;
+-method name newOutputStream descriptor (Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;
+
+-class name java/nio/channels/CompletionHandler
+
+class name java/nio/channels/DatagramChannel
+header extends java/nio/channels/spi/AbstractSelectableChannel implements java/nio/channels/ByteChannel,java/nio/channels/ScatteringByteChannel,java/nio/channels/GatheringByteChannel flags 421
+-method name open descriptor (Ljava/net/ProtocolFamily;)Ljava/nio/channels/DatagramChannel;
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/DatagramChannel;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/DatagramChannel;
+-method name getRemoteAddress descriptor ()Ljava/net/SocketAddress;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/NetworkChannel;
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;
+
+class name java/nio/channels/FileChannel
+header extends java/nio/channels/spi/AbstractInterruptibleChannel implements java/nio/channels/ByteChannel,java/nio/channels/GatheringByteChannel,java/nio/channels/ScatteringByteChannel flags 421
+innerclass innerClass java/nio/channels/FileChannel$MapMode outerClass java/nio/channels/FileChannel innerClassName MapMode flags 9
+-method name open descriptor (Ljava/nio/file/Path;Ljava/util/Set;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/channels/FileChannel;
+-method name open descriptor (Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/nio/channels/FileChannel;
+-method name truncate descriptor (J)Ljava/nio/channels/SeekableByteChannel;
+-method name position descriptor (J)Ljava/nio/channels/SeekableByteChannel;
+
+class name java/nio/channels/FileLock
+header extends java/lang/Object flags 421
+-method name descriptor (Ljava/nio/channels/AsynchronousFileChannel;JJZ)V
+-method name acquiredBy descriptor ()Ljava/nio/channels/Channel;
+-method name close descriptor ()V
+
+-class name java/nio/channels/IllegalChannelGroupException
+
+-class name java/nio/channels/InterruptedByTimeoutException
+
+-class name java/nio/channels/MembershipKey
+
+-class name java/nio/channels/MulticastChannel
+
+-class name java/nio/channels/NetworkChannel
+
+-class name java/nio/channels/ReadPendingException
+
+-class name java/nio/channels/SeekableByteChannel
+
+class name java/nio/channels/Selector
+header extends java/lang/Object flags 421
+
+class name java/nio/channels/ServerSocketChannel
+header extends java/nio/channels/spi/AbstractSelectableChannel flags 421
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/ServerSocketChannel;
+-method name bind descriptor (Ljava/net/SocketAddress;I)Ljava/nio/channels/ServerSocketChannel;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/ServerSocketChannel;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/NetworkChannel;
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;
+
+-class name java/nio/channels/ShutdownChannelGroupException
+
+class name java/nio/channels/SocketChannel
+header extends java/nio/channels/spi/AbstractSelectableChannel implements java/nio/channels/ByteChannel,java/nio/channels/ScatteringByteChannel,java/nio/channels/GatheringByteChannel flags 421
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/SocketChannel;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/SocketChannel;
+-method name shutdownInput descriptor ()Ljava/nio/channels/SocketChannel;
+-method name shutdownOutput descriptor ()Ljava/nio/channels/SocketChannel;
+-method name getRemoteAddress descriptor ()Ljava/net/SocketAddress;
+-method name setOption descriptor (Ljava/net/SocketOption;Ljava/lang/Object;)Ljava/nio/channels/NetworkChannel;
+-method name bind descriptor (Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;
+
+-class name java/nio/channels/WritePendingException
+
+-class name java/nio/channels/spi/AsynchronousChannelProvider
+
+class name java/nio/channels/spi/SelectorProvider
+-method name openDatagramChannel descriptor (Ljava/net/ProtocolFamily;)Ljava/nio/channels/DatagramChannel;
+
+-class name java/nio/charset/StandardCharsets
+
+-class name java/nio/file/AccessDeniedException
+
+-class name java/nio/file/AccessMode
+
+-class name java/nio/file/AtomicMoveNotSupportedException
+
+-class name java/nio/file/ClosedDirectoryStreamException
+
+-class name java/nio/file/ClosedFileSystemException
+
+-class name java/nio/file/ClosedWatchServiceException
+
+-class name java/nio/file/CopyOption
+
+-class name java/nio/file/DirectoryIteratorException
+
+-class name java/nio/file/DirectoryNotEmptyException
+
+-class name java/nio/file/DirectoryStream
+
+-class name java/nio/file/DirectoryStream$Filter
+
+-class name java/nio/file/FileAlreadyExistsException
+
+-class name java/nio/file/FileStore
+
+-class name java/nio/file/FileSystem
+
+-class name java/nio/file/FileSystemAlreadyExistsException
+
+-class name java/nio/file/FileSystemException
+
+-class name java/nio/file/FileSystemLoopException
+
+-class name java/nio/file/FileSystemNotFoundException
+
+-class name java/nio/file/FileSystems
+
+-class name java/nio/file/FileVisitOption
+
+-class name java/nio/file/FileVisitResult
+
+-class name java/nio/file/FileVisitor
+
+-class name java/nio/file/Files
+
+-class name java/nio/file/InvalidPathException
+
+-class name java/nio/file/LinkOption
+
+-class name java/nio/file/LinkPermission
+
+-class name java/nio/file/NoSuchFileException
+
+-class name java/nio/file/NotDirectoryException
+
+-class name java/nio/file/NotLinkException
+
+-class name java/nio/file/OpenOption
+
+-class name java/nio/file/Path
+
+-class name java/nio/file/PathMatcher
+
+-class name java/nio/file/Paths
+
+-class name java/nio/file/ProviderMismatchException
+
+-class name java/nio/file/ProviderNotFoundException
+
+-class name java/nio/file/ReadOnlyFileSystemException
+
+-class name java/nio/file/SecureDirectoryStream
+
+-class name java/nio/file/SimpleFileVisitor
+
+-class name java/nio/file/StandardCopyOption
+
+-class name java/nio/file/StandardOpenOption
+
+-class name java/nio/file/StandardWatchEventKinds
+
+-class name java/nio/file/WatchEvent
+
+-class name java/nio/file/WatchEvent$Kind
+
+-class name java/nio/file/WatchEvent$Modifier
+
+-class name java/nio/file/WatchKey
+
+-class name java/nio/file/WatchService
+
+-class name java/nio/file/Watchable
+
+-class name java/nio/file/attribute/AclEntry
+
+-class name java/nio/file/attribute/AclEntry$Builder
+
+-class name java/nio/file/attribute/AclEntryFlag
+
+-class name java/nio/file/attribute/AclEntryPermission
+
+-class name java/nio/file/attribute/AclEntryType
+
+-class name java/nio/file/attribute/AclFileAttributeView
+
+-class name java/nio/file/attribute/AttributeView
+
+-class name java/nio/file/attribute/BasicFileAttributeView
+
+-class name java/nio/file/attribute/BasicFileAttributes
+
+-class name java/nio/file/attribute/DosFileAttributeView
+
+-class name java/nio/file/attribute/DosFileAttributes
+
+-class name java/nio/file/attribute/FileAttribute
+
+-class name java/nio/file/attribute/FileAttributeView
+
+-class name java/nio/file/attribute/FileOwnerAttributeView
+
+-class name java/nio/file/attribute/FileStoreAttributeView
+
+-class name java/nio/file/attribute/FileTime
+
+-class name java/nio/file/attribute/GroupPrincipal
+
+-class name java/nio/file/attribute/PosixFileAttributeView
+
+-class name java/nio/file/attribute/PosixFileAttributes
+
+-class name java/nio/file/attribute/PosixFilePermission
+
+-class name java/nio/file/attribute/PosixFilePermissions
+
+-class name java/nio/file/attribute/UserDefinedFileAttributeView
+
+-class name java/nio/file/attribute/UserPrincipal
+
+-class name java/nio/file/attribute/UserPrincipalLookupService
+
+-class name java/nio/file/attribute/UserPrincipalNotFoundException
+
+-class name java/nio/file/spi/FileSystemProvider
+
+-class name java/nio/file/spi/FileTypeDetector
+
+-class name java/security/AlgorithmConstraints
+
+-class name java/security/CryptoPrimitive
+
+-class name java/security/cert/CRLReason
+
+class name java/security/cert/CertPathValidatorException
+header extends java/security/GeneralSecurityException flags 21
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;Ljava/security/cert/CertPath;ILjava/security/cert/CertPathValidatorException$Reason;)V
+-method name getReason descriptor ()Ljava/security/cert/CertPathValidatorException$Reason;
+
+-class name java/security/cert/CertPathValidatorException$BasicReason
+
+-class name java/security/cert/CertPathValidatorException$Reason
+
+-class name java/security/cert/CertificateRevokedException
+
+-class name java/security/cert/Extension
+
+-class name java/security/cert/PKIXReason
+
+class name java/security/cert/X509CRLEntry
+-method name getRevocationReason descriptor ()Ljava/security/cert/CRLReason;
+
+class name java/util/ArrayList
+-method name removeAll descriptor (Ljava/util/Collection;)Z
+-method name retainAll descriptor (Ljava/util/Collection;)Z
+-method name listIterator descriptor (I)Ljava/util/ListIterator;
+-method name listIterator descriptor ()Ljava/util/ListIterator;
+-method name iterator descriptor ()Ljava/util/Iterator;
+-method name subList descriptor (II)Ljava/util/List;
+
+class name java/util/Arrays
+-method name asList descriptor ([Ljava/lang/Object;)Ljava/util/List;
+method name asList descriptor ([Ljava/lang/Object;)Ljava/util/List; flags 89 signature ([TT;)Ljava/util/List;
+
+class name java/util/BitSet
+-method name valueOf descriptor ([J)Ljava/util/BitSet;
+-method name valueOf descriptor (Ljava/nio/LongBuffer;)Ljava/util/BitSet;
+-method name valueOf descriptor ([B)Ljava/util/BitSet;
+-method name valueOf descriptor (Ljava/nio/ByteBuffer;)Ljava/util/BitSet;
+-method name toByteArray descriptor ()[B
+-method name toLongArray descriptor ()[J
+-method name previousSetBit descriptor (I)I
+-method name previousClearBit descriptor (I)I
+
+class name java/util/Calendar
+-method name isWeekDateSupported descriptor ()Z
+-method name getWeekYear descriptor ()I
+-method name setWeekDate descriptor (III)V
+-method name getWeeksInWeekYear descriptor ()I
+
+class name java/util/Collections
+-method name emptyIterator descriptor ()Ljava/util/Iterator;
+-method name emptyListIterator descriptor ()Ljava/util/ListIterator;
+-method name emptyEnumeration descriptor ()Ljava/util/Enumeration;
+-method name addAll descriptor (Ljava/util/Collection;[Ljava/lang/Object;)Z
+method name addAll descriptor (Ljava/util/Collection;[Ljava/lang/Object;)Z flags 89 signature (Ljava/util/Collection<-TT;>;[TT;)Z
+
+class name java/util/ConcurrentModificationException
+-method name descriptor (Ljava/lang/Throwable;)V
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;)V
+
+class name java/util/Currency
+-method name getAvailableCurrencies descriptor ()Ljava/util/Set;
+-method name getNumericCode descriptor ()I
+-method name getDisplayName descriptor ()Ljava/lang/String;
+-method name getDisplayName descriptor (Ljava/util/Locale;)Ljava/lang/String;
+
+class name java/util/EnumMap
+-method name hashCode descriptor ()I
+
+class name java/util/EnumSet
+-method name of descriptor (Ljava/lang/Enum;[Ljava/lang/Enum;)Ljava/util/EnumSet;
+method name of descriptor (Ljava/lang/Enum;[Ljava/lang/Enum;)Ljava/util/EnumSet; flags 89 signature ;>(TE;[TE;)Ljava/util/EnumSet;
+
+class name java/util/EventListenerProxy
+header extends java/lang/Object implements java/util/EventListener flags 421
+-method name descriptor (Ljava/util/EventListener;)V
+-method name getListener descriptor ()Ljava/util/EventListener;
+method name descriptor (Ljava/util/EventListener;)V flags 1
+method name getListener descriptor ()Ljava/util/EventListener; flags 1
+
+class name java/util/GregorianCalendar
+-method name isWeekDateSupported descriptor ()Z
+-method name getWeekYear descriptor ()I
+-method name setWeekDate descriptor (III)V
+-method name getWeeksInWeekYear descriptor ()I
+
+-class name java/util/IllformedLocaleException
+
+class name java/util/Locale
+header extends java/lang/Object implements java/lang/Cloneable,java/io/Serializable flags 31
+-field name PRIVATE_USE_EXTENSION descriptor C
+-field name UNICODE_LOCALE_EXTENSION descriptor C
+-method name getDefault descriptor (Ljava/util/Locale$Category;)Ljava/util/Locale;
+-method name setDefault descriptor (Ljava/util/Locale$Category;Ljava/util/Locale;)V
+-method name getScript descriptor ()Ljava/lang/String;
+-method name getExtension descriptor (C)Ljava/lang/String;
+-method name getExtensionKeys descriptor ()Ljava/util/Set;
+-method name getUnicodeLocaleAttributes descriptor ()Ljava/util/Set;
+-method name getUnicodeLocaleType descriptor (Ljava/lang/String;)Ljava/lang/String;
+-method name getUnicodeLocaleKeys descriptor ()Ljava/util/Set;
+-method name toLanguageTag descriptor ()Ljava/lang/String;
+-method name forLanguageTag descriptor (Ljava/lang/String;)Ljava/util/Locale;
+-method name getDisplayScript descriptor ()Ljava/lang/String;
+-method name getDisplayScript descriptor (Ljava/util/Locale;)Ljava/lang/String;
+
+-class name java/util/Locale$Builder
+
+-class name java/util/Locale$Category
+
+-class name java/util/Objects
+
+class name java/util/Properties
+-method name save descriptor (Ljava/io/OutputStream;Ljava/lang/String;)V
+-method name storeToXML descriptor (Ljava/io/OutputStream;Ljava/lang/String;)V
+-method name storeToXML descriptor (Ljava/io/OutputStream;Ljava/lang/String;Ljava/lang/String;)V
+method name save descriptor (Ljava/io/OutputStream;Ljava/lang/String;)V flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+method name storeToXML descriptor (Ljava/io/OutputStream;Ljava/lang/String;)V thrownTypes java/io/IOException flags 21
+method name storeToXML descriptor (Ljava/io/OutputStream;Ljava/lang/String;Ljava/lang/String;)V thrownTypes java/io/IOException flags 21
+
+class name java/util/Scanner
+header extends java/lang/Object implements java/util/Iterator flags 31 signature Ljava/lang/Object;Ljava/util/Iterator;
+-method name descriptor (Ljava/nio/file/Path;)V
+-method name descriptor (Ljava/nio/file/Path;Ljava/lang/String;)V
+
+class name java/util/SimpleTimeZone
+-method name observesDaylightTime descriptor ()Z
+
+class name java/util/TimeZone
+-method name observesDaylightTime descriptor ()Z
+
+class name java/util/Vector
+-method name listIterator descriptor (I)Ljava/util/ListIterator;
+-method name listIterator descriptor ()Ljava/util/ListIterator;
+-method name iterator descriptor ()Ljava/util/Iterator;
+
+-class name java/util/concurrent/ConcurrentLinkedDeque
+
+class name java/util/concurrent/ConcurrentLinkedQueue
+-method name addAll descriptor (Ljava/util/Collection;)Z
+
+-class name java/util/concurrent/ForkJoinPool
+
+-class name java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory
+
+-class name java/util/concurrent/ForkJoinPool$ManagedBlocker
+
+-class name java/util/concurrent/ForkJoinTask
+
+-class name java/util/concurrent/ForkJoinWorkerThread
+
+class name java/util/concurrent/LinkedBlockingQueue
+-method name contains descriptor (Ljava/lang/Object;)Z
+
+-class name java/util/concurrent/LinkedTransferQueue
+
+-class name java/util/concurrent/Phaser
+
+-class name java/util/concurrent/RecursiveAction
+
+-class name java/util/concurrent/RecursiveTask
+
+class name java/util/concurrent/ScheduledThreadPoolExecutor
+-method name setRemoveOnCancelPolicy descriptor (Z)V
+-method name getRemoveOnCancelPolicy descriptor ()Z
+method name remove descriptor (Ljava/lang/Runnable;)Z flags 1
+
+-class name java/util/concurrent/ThreadLocalRandom
+
+class name java/util/concurrent/ThreadPoolExecutor
+-method name toString descriptor ()Ljava/lang/String;
+
+-class name java/util/concurrent/TransferQueue
+
+class name java/util/concurrent/locks/AbstractQueuedLongSynchronizer
+-method name hasQueuedPredecessors descriptor ()Z
+
+class name java/util/concurrent/locks/AbstractQueuedSynchronizer
+-method name hasQueuedPredecessors descriptor ()Z
+
+class name java/util/regex/Matcher
+-method name group descriptor (Ljava/lang/String;)Ljava/lang/String;
+
+class name java/util/regex/Pattern
+-field name UNICODE_CHARACTER_CLASS descriptor I
+
+class name java/util/spi/CurrencyNameProvider
+-method name getDisplayName descriptor (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+
+class name java/util/spi/LocaleNameProvider
+-method name getDisplayScript descriptor (Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String;
+
+class name java/util/zip/Deflater
+-field name NO_FLUSH descriptor I
+-field name SYNC_FLUSH descriptor I
+-field name FULL_FLUSH descriptor I
+-method name setInput descriptor ([BII)V
+-method name setDictionary descriptor ([BII)V
+-method name setStrategy descriptor (I)V
+-method name setLevel descriptor (I)V
+-method name finish descriptor ()V
+-method name finished descriptor ()Z
+-method name deflate descriptor ([BII)I
+-method name deflate descriptor ([BIII)I
+-method name getAdler descriptor ()I
+-method name getBytesRead descriptor ()J
+-method name getBytesWritten descriptor ()J
+-method name reset descriptor ()V
+-method name end descriptor ()V
+method name setInput descriptor ([BII)V flags 21
+method name setDictionary descriptor ([BII)V flags 21
+method name setStrategy descriptor (I)V flags 21
+method name setLevel descriptor (I)V flags 21
+method name finish descriptor ()V flags 21
+method name finished descriptor ()Z flags 21
+method name deflate descriptor ([BII)I flags 21
+method name getAdler descriptor ()I flags 21
+method name getBytesRead descriptor ()J flags 21
+method name getBytesWritten descriptor ()J flags 21
+method name reset descriptor ()V flags 21
+method name end descriptor ()V flags 21
+
+class name java/util/zip/DeflaterOutputStream
+-method name descriptor (Ljava/io/OutputStream;Ljava/util/zip/Deflater;IZ)V
+-method name descriptor (Ljava/io/OutputStream;Ljava/util/zip/Deflater;Z)V
+-method name descriptor (Ljava/io/OutputStream;Z)V
+-method name flush descriptor ()V
+
+class name java/util/zip/GZIPOutputStream
+-method name descriptor (Ljava/io/OutputStream;IZ)V
+-method name descriptor (Ljava/io/OutputStream;Z)V
+
+class name java/util/zip/Inflater
+-method name setInput descriptor ([BII)V
+-method name setDictionary descriptor ([BII)V
+-method name getRemaining descriptor ()I
+-method name needsInput descriptor ()Z
+-method name needsDictionary descriptor ()Z
+-method name finished descriptor ()Z
+-method name inflate descriptor ([BII)I
+-method name getAdler descriptor ()I
+-method name getBytesRead descriptor ()J
+-method name getBytesWritten descriptor ()J
+-method name reset descriptor ()V
+-method name end descriptor ()V
+method name setInput descriptor ([BII)V flags 21
+method name setDictionary descriptor ([BII)V flags 21
+method name getRemaining descriptor ()I flags 21
+method name needsInput descriptor ()Z flags 21
+method name needsDictionary descriptor ()Z flags 21
+method name finished descriptor ()Z flags 21
+method name inflate descriptor ([BII)I thrownTypes java/util/zip/DataFormatException flags 21
+method name getAdler descriptor ()I flags 21
+method name getBytesRead descriptor ()J flags 21
+method name getBytesWritten descriptor ()J flags 21
+method name reset descriptor ()V flags 21
+method name end descriptor ()V flags 21
+
+class name java/util/zip/ZipFile
+header extends java/lang/Object implements java/util/zip/ZipConstants flags 21
+-method name descriptor (Ljava/io/File;ILjava/nio/charset/Charset;)V
+-method name descriptor (Ljava/lang/String;Ljava/nio/charset/Charset;)V
+-method name descriptor (Ljava/io/File;Ljava/nio/charset/Charset;)V
+-method name getComment descriptor ()Ljava/lang/String;
+
+class name java/util/zip/ZipInputStream
+-method name descriptor (Ljava/io/InputStream;Ljava/nio/charset/Charset;)V
+
+class name java/util/zip/ZipOutputStream
+-method name descriptor (Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
+
+-class name javax/crypto/AEADBadTagException
+
+class name javax/crypto/Cipher
+-method name updateAAD descriptor ([B)V
+-method name updateAAD descriptor ([BII)V
+-method name updateAAD descriptor (Ljava/nio/ByteBuffer;)V
+
+class name javax/crypto/CipherSpi
+-method name engineUpdateAAD descriptor ([BII)V
+-method name engineUpdateAAD descriptor (Ljava/nio/ByteBuffer;)V
+
+-class name javax/crypto/spec/GCMParameterSpec
+
+-class name javax/net/ssl/ExtendedSSLSession
+
+class name javax/net/ssl/SSLEngine
+-method name getHandshakeSession descriptor ()Ljavax/net/ssl/SSLSession;
+
+class name javax/net/ssl/SSLEngineResult
+header extends java/lang/Object flags 21
+innerclass innerClass javax/net/ssl/SSLEngineResult$HandshakeStatus outerClass javax/net/ssl/SSLEngineResult innerClassName HandshakeStatus flags 4019
+innerclass innerClass javax/net/ssl/SSLEngineResult$Status outerClass javax/net/ssl/SSLEngineResult innerClassName Status flags 4019
+
+class name javax/net/ssl/SSLParameters
+-method name getAlgorithmConstraints descriptor ()Ljava/security/AlgorithmConstraints;
+-method name setAlgorithmConstraints descriptor (Ljava/security/AlgorithmConstraints;)V
+-method name getEndpointIdentificationAlgorithm descriptor ()Ljava/lang/String;
+-method name setEndpointIdentificationAlgorithm descriptor (Ljava/lang/String;)V
+
+class name javax/net/ssl/SSLServerSocket
+-method name getSSLParameters descriptor ()Ljavax/net/ssl/SSLParameters;
+-method name setSSLParameters descriptor (Ljavax/net/ssl/SSLParameters;)V
+
+class name javax/net/ssl/SSLSocket
+-method name getHandshakeSession descriptor ()Ljavax/net/ssl/SSLSession;
+
+-class name javax/net/ssl/X509ExtendedTrustManager
+
+class name javax/security/auth/login/Configuration
+-method name getConfiguration descriptor ()Ljavax/security/auth/login/Configuration;
+method name getConfiguration descriptor ()Ljavax/security/auth/login/Configuration; flags 29
+
diff --git a/langtools/make/data/symbols/java.base-7.sym.txt b/langtools/make/data/symbols/java.base-7.sym.txt
new file mode 100644
index 00000000000..69ce3abfc13
--- /dev/null
+++ b/langtools/make/data/symbols/java.base-7.sym.txt
@@ -0,0 +1,4129 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/io/BufferedInputStream
+header extends java/io/FilterInputStream flags 21
+
+class name java/io/BufferedOutputStream
+header extends java/io/FilterOutputStream flags 21
+
+class name java/io/BufferedReader
+header extends java/io/Reader flags 21
+-method name lines descriptor ()Ljava/util/stream/Stream;
+
+class name java/io/BufferedWriter
+header extends java/io/Writer flags 21
+
+class name java/io/ByteArrayInputStream
+header extends java/io/InputStream flags 21
+
+class name java/io/ByteArrayOutputStream
+header extends java/io/OutputStream flags 21
+
+class name java/io/CharArrayReader
+header extends java/io/Reader flags 21
+
+class name java/io/CharArrayWriter
+header extends java/io/Writer flags 21
+
+class name java/io/CharConversionException
+header extends java/io/IOException flags 21
+
+class name java/io/Closeable
+header extends java/lang/Object implements java/lang/AutoCloseable flags 601
+
+class name java/io/Console
+header extends java/lang/Object implements java/io/Flushable flags 31
+
+class name java/io/DataInput
+header extends java/lang/Object flags 601
+
+class name java/io/DataInputStream
+header extends java/io/FilterInputStream implements java/io/DataInput flags 21
+
+class name java/io/DataOutput
+header extends java/lang/Object flags 601
+
+class name java/io/DataOutputStream
+header extends java/io/FilterOutputStream implements java/io/DataOutput flags 21
+
+class name java/io/EOFException
+header extends java/io/IOException flags 21
+
+class name java/io/Externalizable
+header extends java/lang/Object implements java/io/Serializable flags 601
+
+class name java/io/File
+header extends java/lang/Object implements java/io/Serializable,java/lang/Comparable flags 21 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable;
+
+class name java/io/FileDescriptor
+header extends java/lang/Object flags 31
+
+class name java/io/FileFilter
+header extends java/lang/Object flags 601
+
+class name java/io/FileInputStream
+header extends java/io/InputStream flags 21
+
+class name java/io/FileNotFoundException
+header extends java/io/IOException flags 21
+
+class name java/io/FileOutputStream
+header extends java/io/OutputStream flags 21
+
+class name java/io/FilePermission
+header extends java/security/Permission implements java/io/Serializable flags 31
+
+class name java/io/FileReader
+header extends java/io/InputStreamReader flags 21
+
+class name java/io/FileWriter
+header extends java/io/OutputStreamWriter flags 21
+
+class name java/io/FilenameFilter
+header extends java/lang/Object flags 601
+
+class name java/io/FilterInputStream
+header extends java/io/InputStream flags 21
+
+class name java/io/FilterOutputStream
+header extends java/io/OutputStream flags 21
+
+class name java/io/FilterReader
+header extends java/io/Reader flags 421
+
+class name java/io/FilterWriter
+header extends java/io/Writer flags 421
+
+class name java/io/Flushable
+header extends java/lang/Object flags 601
+
+class name java/io/IOError
+header extends java/lang/Error flags 21
+
+class name java/io/IOException
+header extends java/lang/Exception flags 21
+
+class name java/io/InputStream
+header extends java/lang/Object implements java/io/Closeable flags 421
+
+class name java/io/InputStreamReader
+header extends java/io/Reader flags 21
+
+class name java/io/InterruptedIOException
+header extends java/io/IOException flags 21
+
+class name java/io/InvalidClassException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/InvalidObjectException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/LineNumberInputStream
+header extends java/io/FilterInputStream flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+
+class name java/io/LineNumberReader
+header extends java/io/BufferedReader flags 21
+
+class name java/io/NotActiveException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/NotSerializableException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/ObjectInput
+header extends java/lang/Object implements java/io/DataInput,java/lang/AutoCloseable flags 601
+
+class name java/io/ObjectInputStream
+header extends java/io/InputStream implements java/io/ObjectInput,java/io/ObjectStreamConstants flags 21
+innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
+
+class name java/io/ObjectInputValidation
+header extends java/lang/Object flags 601
+
+class name java/io/ObjectOutput
+header extends java/lang/Object implements java/io/DataOutput,java/lang/AutoCloseable flags 601
+
+class name java/io/ObjectOutputStream
+header extends java/io/OutputStream implements java/io/ObjectOutput,java/io/ObjectStreamConstants flags 21
+innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
+
+class name java/io/ObjectStreamClass
+header extends java/lang/Object implements java/io/Serializable flags 21
+-method name forClass descriptor ()Ljava/lang/Class;
+method name forClass descriptor ()Ljava/lang/Class; flags 1 signature ()Ljava/lang/Class<*>;
+
+class name java/io/ObjectStreamConstants
+header extends java/lang/Object flags 601
+
+class name java/io/ObjectStreamException
+header extends java/io/IOException flags 421
+
+class name java/io/ObjectStreamField
+header extends java/lang/Object implements java/lang/Comparable flags 21 signature Ljava/lang/Object;Ljava/lang/Comparable;
+-method name getType descriptor ()Ljava/lang/Class;
+method name getType descriptor ()Ljava/lang/Class; flags 1 signature ()Ljava/lang/Class<*>;
+
+class name java/io/OptionalDataException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/OutputStream
+header extends java/lang/Object implements java/io/Closeable,java/io/Flushable flags 421
+
+class name java/io/OutputStreamWriter
+header extends java/io/Writer flags 21
+
+class name java/io/PipedInputStream
+header extends java/io/InputStream flags 21
+
+class name java/io/PipedOutputStream
+header extends java/io/OutputStream flags 21
+
+class name java/io/PipedReader
+header extends java/io/Reader flags 21
+
+class name java/io/PipedWriter
+header extends java/io/Writer flags 21
+
+class name java/io/PrintStream
+header extends java/io/FilterOutputStream implements java/lang/Appendable,java/io/Closeable flags 21
+
+class name java/io/PrintWriter
+header extends java/io/Writer flags 21
+
+class name java/io/PushbackInputStream
+header extends java/io/FilterInputStream flags 21
+
+class name java/io/PushbackReader
+header extends java/io/FilterReader flags 21
+
+class name java/io/RandomAccessFile
+header extends java/lang/Object implements java/io/DataOutput,java/io/DataInput,java/io/Closeable flags 21
+-method name seek descriptor (J)V
+method name seek descriptor (J)V thrownTypes java/io/IOException flags 101
+
+class name java/io/Reader
+header extends java/lang/Object implements java/lang/Readable,java/io/Closeable flags 421
+
+class name java/io/SequenceInputStream
+header extends java/io/InputStream flags 21
+
+class name java/io/Serializable
+header extends java/lang/Object flags 601
+
+class name java/io/SerializablePermission
+header extends java/security/BasicPermission flags 31
+
+class name java/io/StreamCorruptedException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/StreamTokenizer
+header extends java/lang/Object flags 21
+
+class name java/io/StringBufferInputStream
+header extends java/io/InputStream flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+
+class name java/io/StringReader
+header extends java/io/Reader flags 21
+
+class name java/io/StringWriter
+header extends java/io/Writer flags 21
+
+class name java/io/SyncFailedException
+header extends java/io/IOException flags 21
+
+class name java/io/UTFDataFormatException
+header extends java/io/IOException flags 21
+
+-class name java/io/UncheckedIOException
+
+class name java/io/UnsupportedEncodingException
+header extends java/io/IOException flags 21
+
+class name java/io/WriteAbortedException
+header extends java/io/ObjectStreamException flags 21
+
+class name java/io/Writer
+header extends java/lang/Object implements java/lang/Appendable,java/io/Closeable,java/io/Flushable flags 421
+
+class name java/lang/AbstractMethodError
+header extends java/lang/IncompatibleClassChangeError flags 21
+
+class name java/lang/AbstractStringBuilder
+header extends java/lang/Object implements java/lang/Appendable,java/lang/CharSequence flags 420
+
+class name java/lang/Appendable
+header extends java/lang/Object flags 601
+
+class name java/lang/ArithmeticException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/ArrayIndexOutOfBoundsException
+header extends java/lang/IndexOutOfBoundsException flags 21
+
+class name java/lang/ArrayStoreException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/AssertionError
+header extends java/lang/Error flags 21
+
+class name java/lang/AutoCloseable
+header extends java/lang/Object flags 601
+
+class name java/lang/Boolean
+header extends java/lang/Object implements java/io/Serializable,java/lang/Comparable flags 31 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable;
+-method name hashCode descriptor (Z)I
+-method name logicalAnd descriptor (ZZ)Z
+-method name logicalOr descriptor (ZZ)Z
+-method name logicalXor descriptor (ZZ)Z
+
+class name java/lang/BootstrapMethodError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/Byte
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable;
+-field name BYTES descriptor I
+-method name hashCode descriptor (B)I
+-method name toUnsignedInt descriptor (B)I
+-method name toUnsignedLong descriptor (B)J
+
+class name java/lang/CharSequence
+header extends java/lang/Object flags 601
+-method name chars descriptor ()Ljava/util/stream/IntStream;
+-method name codePoints descriptor ()Ljava/util/stream/IntStream;
+
+class name java/lang/Character
+header extends java/lang/Object implements java/io/Serializable,java/lang/Comparable flags 31 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable;
+innerclass innerClass java/lang/Character$Subset outerClass java/lang/Character innerClassName Subset flags 9
+innerclass innerClass java/lang/Character$UnicodeBlock outerClass java/lang/Character innerClassName UnicodeBlock flags 19
+innerclass innerClass java/lang/Character$UnicodeScript outerClass java/lang/Character innerClassName UnicodeScript flags 4019
+-field name BYTES descriptor I
+-method name hashCode descriptor (C)I
+
+class name java/lang/Character$UnicodeBlock
+-field name ARABIC_EXTENDED_A descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SUNDANESE_SUPPLEMENT descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MEETEI_MAYEK_EXTENSIONS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MEROITIC_HIEROGLYPHS descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MEROITIC_CURSIVE descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SORA_SOMPENG descriptor Ljava/lang/Character$UnicodeBlock;
+-field name CHAKMA descriptor Ljava/lang/Character$UnicodeBlock;
+-field name SHARADA descriptor Ljava/lang/Character$UnicodeBlock;
+-field name TAKRI descriptor Ljava/lang/Character$UnicodeBlock;
+-field name MIAO descriptor Ljava/lang/Character$UnicodeBlock;
+-field name ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS descriptor Ljava/lang/Character$UnicodeBlock;
+
+class name java/lang/Character$UnicodeScript
+-field name MEROITIC_HIEROGLYPHS descriptor Ljava/lang/Character$UnicodeScript;
+-field name MEROITIC_CURSIVE descriptor Ljava/lang/Character$UnicodeScript;
+-field name SORA_SOMPENG descriptor Ljava/lang/Character$UnicodeScript;
+-field name CHAKMA descriptor Ljava/lang/Character$UnicodeScript;
+-field name SHARADA descriptor Ljava/lang/Character$UnicodeScript;
+-field name TAKRI descriptor Ljava/lang/Character$UnicodeScript;
+-field name MIAO descriptor Ljava/lang/Character$UnicodeScript;
+
+class name java/lang/Class
+header extends java/lang/Object implements java/io/Serializable,java/lang/reflect/GenericDeclaration,java/lang/reflect/Type,java/lang/reflect/AnnotatedElement flags 31 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/reflect/GenericDeclaration;Ljava/lang/reflect/Type;Ljava/lang/reflect/AnnotatedElement;
+-method name toGenericString descriptor ()Ljava/lang/String;
+-method name forName descriptor (Ljava/lang/String;)Ljava/lang/Class;
+-method name forName descriptor (Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+-method name newInstance descriptor ()Ljava/lang/Object;
+-method name getClassLoader descriptor ()Ljava/lang/ClassLoader;
+-method name getInterfaces descriptor ()[Ljava/lang/Class;
+-method name getEnclosingMethod descriptor ()Ljava/lang/reflect/Method;
+-method name getEnclosingConstructor descriptor ()Ljava/lang/reflect/Constructor;
+-method name getDeclaringClass descriptor ()Ljava/lang/Class;
+-method name getEnclosingClass descriptor ()Ljava/lang/Class;
+-method name getTypeName descriptor ()Ljava/lang/String;
+-method name getClasses descriptor ()[Ljava/lang/Class;
+-method name getFields descriptor ()[Ljava/lang/reflect/Field;
+-method name getMethods descriptor ()[Ljava/lang/reflect/Method;
+-method name getConstructors descriptor ()[Ljava/lang/reflect/Constructor;
+-method name getField descriptor (Ljava/lang/String;)Ljava/lang/reflect/Field;
+-method name getMethod descriptor (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+-method name getConstructor descriptor ([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+-method name getDeclaredClasses descriptor ()[Ljava/lang/Class;
+-method name getDeclaredFields descriptor ()[Ljava/lang/reflect/Field;
+-method name getDeclaredMethods descriptor ()[Ljava/lang/reflect/Method;
+-method name getDeclaredConstructors descriptor ()[Ljava/lang/reflect/Constructor;
+-method name getDeclaredField descriptor (Ljava/lang/String;)Ljava/lang/reflect/Field;
+-method name getDeclaredMethod descriptor (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+-method name getDeclaredConstructor descriptor ([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+-method name getAnnotationsByType descriptor (Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;
+-method name getDeclaredAnnotation descriptor (Ljava/lang/Class;)Ljava/lang/annotation/Annotation;
+-method name getDeclaredAnnotationsByType descriptor (Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;
+-method name getAnnotatedSuperclass descriptor ()Ljava/lang/reflect/AnnotatedType;
+-method name getAnnotatedInterfaces descriptor ()[Ljava/lang/reflect/AnnotatedType;
+method name forName descriptor (Ljava/lang/String;)Ljava/lang/Class; thrownTypes java/lang/ClassNotFoundException flags 9 signature (Ljava/lang/String;)Ljava/lang/Class<*>;
+method name forName descriptor (Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class; thrownTypes java/lang/ClassNotFoundException flags 9 signature (Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class<*>;
+method name newInstance descriptor ()Ljava/lang/Object; thrownTypes java/lang/InstantiationException,java/lang/IllegalAccessException flags 1 signature ()TT;
+method name getClassLoader descriptor ()Ljava/lang/ClassLoader; flags 1
+method name getInterfaces descriptor ()[Ljava/lang/Class; flags 101 signature ()[Ljava/lang/Class<*>;
+method name getEnclosingMethod descriptor ()Ljava/lang/reflect/Method; flags 1
+method name getEnclosingConstructor descriptor ()Ljava/lang/reflect/Constructor; flags 1 signature ()Ljava/lang/reflect/Constructor<*>;
+method name getDeclaringClass descriptor ()Ljava/lang/Class; flags 101 signature ()Ljava/lang/Class<*>;
+method name getEnclosingClass descriptor ()Ljava/lang/Class; flags 1 signature ()Ljava/lang/Class<*>;
+method name getClasses descriptor ()[Ljava/lang/Class; flags 1 signature ()[Ljava/lang/Class<*>;
+method name getFields descriptor ()[Ljava/lang/reflect/Field; thrownTypes java/lang/SecurityException flags 1
+method name getMethods descriptor ()[Ljava/lang/reflect/Method; thrownTypes java/lang/SecurityException flags 1
+method name getConstructors descriptor ()[Ljava/lang/reflect/Constructor; thrownTypes java/lang/SecurityException flags 1 signature ()[Ljava/lang/reflect/Constructor<*>;
+method name getField descriptor (Ljava/lang/String;)Ljava/lang/reflect/Field; thrownTypes java/lang/NoSuchFieldException,java/lang/SecurityException flags 1
+method name getMethod descriptor (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; thrownTypes java/lang/NoSuchMethodException,java/lang/SecurityException flags 81 signature (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+method name getConstructor descriptor ([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; thrownTypes java/lang/NoSuchMethodException,java/lang/SecurityException flags 81 signature ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor;
+method name getDeclaredClasses descriptor ()[Ljava/lang/Class; thrownTypes java/lang/SecurityException flags 1 signature ()[Ljava/lang/Class<*>;
+method name getDeclaredFields descriptor ()[Ljava/lang/reflect/Field; thrownTypes java/lang/SecurityException flags 1
+method name getDeclaredMethods descriptor ()[Ljava/lang/reflect/Method; thrownTypes java/lang/SecurityException flags 1
+method name getDeclaredConstructors descriptor ()[Ljava/lang/reflect/Constructor; thrownTypes java/lang/SecurityException flags 1 signature ()[Ljava/lang/reflect/Constructor<*>;
+method name getDeclaredField descriptor (Ljava/lang/String;)Ljava/lang/reflect/Field; thrownTypes java/lang/NoSuchFieldException,java/lang/SecurityException flags 1
+method name getDeclaredMethod descriptor (Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; thrownTypes java/lang/NoSuchMethodException,java/lang/SecurityException flags 81 signature (Ljava/lang/String;[Ljava/lang/Class<*>;)Ljava/lang/reflect/Method;
+method name getDeclaredConstructor descriptor ([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; thrownTypes java/lang/NoSuchMethodException,java/lang/SecurityException flags 81 signature ([Ljava/lang/Class<*>;)Ljava/lang/reflect/Constructor;
+
+class name java/lang/ClassCastException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/ClassCircularityError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/ClassFormatError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/ClassLoader
+header extends java/lang/Object flags 421
+-method name registerAsParallelCapable descriptor ()Z
+-method name getParent descriptor ()Ljava/lang/ClassLoader;
+-method name getSystemClassLoader descriptor ()Ljava/lang/ClassLoader;
+method name registerAsParallelCapable descriptor ()Z flags c
+method name getParent descriptor ()Ljava/lang/ClassLoader; flags 11
+method name getSystemClassLoader descriptor ()Ljava/lang/ClassLoader; flags 9
+
+class name java/lang/ClassNotFoundException
+header extends java/lang/ReflectiveOperationException flags 21
+
+class name java/lang/ClassValue
+header extends java/lang/Object flags 421 signature Ljava/lang/Object;
+
+class name java/lang/CloneNotSupportedException
+header extends java/lang/Exception flags 21
+
+class name java/lang/Cloneable
+header extends java/lang/Object flags 601
+
+class name java/lang/Comparable
+header extends java/lang/Object flags 601 signature Ljava/lang/Object;
+
+class name java/lang/Compiler
+header extends java/lang/Object flags 31
+
+class name java/lang/Deprecated
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;PARAMETER;eLjava/lang/annotation/ElementType;TYPE;})
+
+class name java/lang/Double
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable;
+-field name BYTES descriptor I
+-method name isFinite descriptor (D)Z
+-method name hashCode descriptor (D)I
+-method name sum descriptor (DD)D
+-method name max descriptor (DD)D
+-method name min descriptor (DD)D
+
+class name java/lang/Enum
+header extends java/lang/Object implements java/lang/Comparable,java/io/Serializable flags 421 signature ;>Ljava/lang/Object;Ljava/lang/Comparable;Ljava/io/Serializable;
+
+class name java/lang/EnumConstantNotPresentException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/Error
+header extends java/lang/Throwable flags 21
+
+class name java/lang/Exception
+header extends java/lang/Throwable flags 21
+
+class name java/lang/ExceptionInInitializerError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/Float
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable;
+-field name BYTES descriptor I
+-method name isFinite descriptor (F)Z
+-method name hashCode descriptor (F)I
+-method name sum descriptor (FF)F
+-method name max descriptor (FF)F
+-method name min descriptor (FF)F
+
+-class name java/lang/FunctionalInterface
+
+class name java/lang/IllegalAccessError
+header extends java/lang/IncompatibleClassChangeError flags 21
+
+class name java/lang/IllegalAccessException
+header extends java/lang/ReflectiveOperationException flags 21
+
+class name java/lang/IllegalArgumentException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/IllegalMonitorStateException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/IllegalStateException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/IllegalThreadStateException
+header extends java/lang/IllegalArgumentException flags 21
+
+class name java/lang/IncompatibleClassChangeError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/IndexOutOfBoundsException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/InheritableThreadLocal
+header extends java/lang/ThreadLocal flags 21 signature Ljava/lang/ThreadLocal;
+
+class name java/lang/InstantiationError
+header extends java/lang/IncompatibleClassChangeError flags 21
+
+class name java/lang/InstantiationException
+header extends java/lang/ReflectiveOperationException flags 21
+
+class name java/lang/Integer
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable;
+-field name BYTES descriptor I
+-method name toUnsignedString descriptor (II)Ljava/lang/String;
+-method name toUnsignedString descriptor (I)Ljava/lang/String;
+-method name parseUnsignedInt descriptor (Ljava/lang/String;I)I
+-method name parseUnsignedInt descriptor (Ljava/lang/String;)I
+-method name hashCode descriptor (I)I
+-method name compareUnsigned descriptor (II)I
+-method name toUnsignedLong descriptor (I)J
+-method name divideUnsigned descriptor (II)I
+-method name remainderUnsigned descriptor (II)I
+-method name sum descriptor (II)I
+-method name max descriptor (II)I
+-method name min descriptor (II)I
+
+class name java/lang/InternalError
+header extends java/lang/VirtualMachineError flags 21
+-method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;)V
+-method name descriptor (Ljava/lang/Throwable;)V
+
+class name java/lang/InterruptedException
+header extends java/lang/Exception flags 21
+
+class name java/lang/Iterable
+header extends java/lang/Object flags 601 signature Ljava/lang/Object;
+-method name forEach descriptor (Ljava/util/function/Consumer;)V
+-method name spliterator descriptor ()Ljava/util/Spliterator;
+
+class name java/lang/LinkageError
+header extends java/lang/Error flags 21
+
+class name java/lang/Long
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable;
+-field name BYTES descriptor I
+-method name toUnsignedString descriptor (JI)Ljava/lang/String;
+-method name toUnsignedString descriptor (J)Ljava/lang/String;
+-method name parseUnsignedLong descriptor (Ljava/lang/String;I)J
+-method name parseUnsignedLong descriptor (Ljava/lang/String;)J
+-method name hashCode descriptor (J)I
+-method name compareUnsigned descriptor (JJ)I
+-method name divideUnsigned descriptor (JJ)J
+-method name remainderUnsigned descriptor (JJ)J
+-method name sum descriptor (JJ)J
+-method name max descriptor (JJ)J
+-method name min descriptor (JJ)J
+
+class name java/lang/Math
+header extends java/lang/Object flags 31
+-method name addExact descriptor (II)I
+-method name addExact descriptor (JJ)J
+-method name subtractExact descriptor (II)I
+-method name subtractExact descriptor (JJ)J
+-method name multiplyExact descriptor (II)I
+-method name multiplyExact descriptor (JJ)J
+-method name incrementExact descriptor (I)I
+-method name incrementExact descriptor (J)J
+-method name decrementExact descriptor (I)I
+-method name decrementExact descriptor (J)J
+-method name negateExact descriptor (I)I
+-method name negateExact descriptor (J)J
+-method name toIntExact descriptor (J)I
+-method name floorDiv descriptor (II)I
+-method name floorDiv descriptor (JJ)J
+-method name floorMod descriptor (II)I
+-method name floorMod descriptor (JJ)J
+-method name nextDown descriptor (D)D
+-method name nextDown descriptor (F)F
+
+class name java/lang/NegativeArraySizeException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/NoClassDefFoundError
+header extends java/lang/LinkageError flags 21
+
+class name java/lang/NoSuchFieldError
+header extends java/lang/IncompatibleClassChangeError flags 21
+
+class name java/lang/NoSuchFieldException
+header extends java/lang/ReflectiveOperationException flags 21
+
+class name java/lang/NoSuchMethodError
+header extends java/lang/IncompatibleClassChangeError flags 21
+
+class name java/lang/NoSuchMethodException
+header extends java/lang/ReflectiveOperationException flags 21
+
+class name java/lang/NullPointerException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/Number
+header extends java/lang/Object implements java/io/Serializable flags 421
+
+class name java/lang/NumberFormatException
+header extends java/lang/IllegalArgumentException flags 21
+
+class name java/lang/Object
+header flags 21
+
+class name java/lang/OutOfMemoryError
+header extends java/lang/VirtualMachineError flags 21
+
+class name java/lang/Override
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)
+
+class name java/lang/Package
+header extends java/lang/Object implements java/lang/reflect/AnnotatedElement flags 21
+-method name getPackage descriptor (Ljava/lang/String;)Ljava/lang/Package;
+-method name getPackages descriptor ()[Ljava/lang/Package;
+-method name getAnnotationsByType descriptor (Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;
+-method name getDeclaredAnnotation descriptor (Ljava/lang/Class;)Ljava/lang/annotation/Annotation;
+-method name getDeclaredAnnotationsByType descriptor (Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;
+method name getPackage descriptor (Ljava/lang/String;)Ljava/lang/Package; flags 9
+method name getPackages descriptor ()[Ljava/lang/Package; flags 9
+
+class name java/lang/Process
+header extends java/lang/Object flags 421
+-method name waitFor descriptor (JLjava/util/concurrent/TimeUnit;)Z
+-method name destroyForcibly descriptor ()Ljava/lang/Process;
+-method name isAlive descriptor ()Z
+
+class name java/lang/ProcessBuilder
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/ProcessBuilder$Redirect outerClass java/lang/ProcessBuilder innerClassName Redirect flags 409
+
+class name java/lang/Readable
+header extends java/lang/Object flags 601
+
+class name java/lang/ReflectiveOperationException
+header extends java/lang/Exception flags 21
+
+class name java/lang/Runnable
+header extends java/lang/Object flags 601
+
+class name java/lang/Runtime
+header extends java/lang/Object flags 21
+-method name load descriptor (Ljava/lang/String;)V
+-method name loadLibrary descriptor (Ljava/lang/String;)V
+method name load descriptor (Ljava/lang/String;)V flags 1
+method name loadLibrary descriptor (Ljava/lang/String;)V flags 1
+
+class name java/lang/RuntimeException
+header extends java/lang/Exception flags 21
+
+class name java/lang/RuntimePermission
+header extends java/security/BasicPermission flags 31
+
+class name java/lang/SafeVarargs
+header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;METHOD;})
+
+class name java/lang/SecurityException
+header extends java/lang/RuntimeException flags 21
+
+class name java/lang/SecurityManager
+header extends java/lang/Object flags 21
+-method name checkTopLevelWindow descriptor (Ljava/lang/Object;)Z
+-method name checkSystemClipboardAccess descriptor ()V
+-method name checkAwtEventQueueAccess descriptor ()V
+-method name checkMemberAccess descriptor (Ljava/lang/Class;I)V
+method name checkTopLevelWindow descriptor (Ljava/lang/Object;)Z flags 1
+method name checkSystemClipboardAccess descriptor ()V flags 1
+method name checkAwtEventQueueAccess descriptor ()V flags 1
+method name checkMemberAccess descriptor (Ljava/lang/Class;I)V flags 1 signature (Ljava/lang/Class<*>;I)V
+
+class name java/lang/Short
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable