From 3da2de846c9a7d9abbf47d0292bd4c029ecc47b2 Mon Sep 17 00:00:00 2001 From: Lance Andersen Date: Mon, 4 Jan 2016 12:25:45 -0500 Subject: [PATCH 01/37] 8144082: Add Statement.enquoteNCharLiteral Reviewed-by: joehw --- .../share/classes/java/sql/Statement.java | 39 +++++++++++++++++ .../sql/testng/test/sql/StatementTests.java | 43 +++++++++++++++++-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/jdk/src/java.sql/share/classes/java/sql/Statement.java b/jdk/src/java.sql/share/classes/java/sql/Statement.java index 3dd29c2a9c0..fe40a2f988e 100644 --- a/jdk/src/java.sql/share/classes/java/sql/Statement.java +++ b/jdk/src/java.sql/share/classes/java/sql/Statement.java @@ -1582,4 +1582,43 @@ public interface Statement extends Wrapper, AutoCloseable { return len >= 1 && len <= 128 && Pattern.compile("[\\p{Alpha}][\\p{Alnum}_]*").matcher(identifier).matches(); } + + /** + * Returns a {@code String} representing a National Character Set Literal + * enclosed in single quotes and prefixed with a upper case letter N. + * Any occurrence of a single quote within the string will be replaced + * by two single quotes. + * + *
+ * + * + * + * + * + * + * + * + * + * + * + * + * + *
Examples of the conversion:
ValueResult
Hello N'Hello'
G'Day N'G''Day'
'G''Day'N'''G''''Day'''
I'''M N'I''''''M'
N'Hello' N'N''Hello'''
+ *
+ * @implNote + * JDBC driver implementations may need to provide their own implementation + * of this method in order to meet the requirements of the underlying + * datasource. An implementation of enquoteNCharLiteral may accept a different + * set of characters than that accepted by the same drivers implementation of + * enquoteLiteral. + * @param val a character string + * @return the result of replacing every single quote character in the + * argument by two single quote characters where this entire result is + * then prefixed with 'N'. + * @throws NullPointerException if val is {@code null} + * @throws SQLException if a database access error occurs + */ + default String enquoteNCharLiteral(String val) throws SQLException { + return "N'" + val.replace("'", "''") + "'"; + } } diff --git a/jdk/test/java/sql/testng/test/sql/StatementTests.java b/jdk/test/java/sql/testng/test/sql/StatementTests.java index 169b7342d04..88697b77f9d 100644 --- a/jdk/test/java/sql/testng/test/sql/StatementTests.java +++ b/jdk/test/java/sql/testng/test/sql/StatementTests.java @@ -65,7 +65,7 @@ public class StatementTests extends BaseTest { * enquoteLiteral is null */ @Test(expectedExceptions = NullPointerException.class) - public void test01() throws SQLException { + public void test01() throws SQLException { stmt.enquoteLiteral(null); } @@ -110,7 +110,7 @@ public class StatementTests extends BaseTest { } /* - * Validate a NullPointerException is thrown is the string passed to + * Validate a NullPointerException is thrown if the string passed to * isSimpleIdentifier is null */ @Test(expectedExceptions = NullPointerException.class) @@ -119,6 +119,24 @@ public class StatementTests extends BaseTest { } + /* + * Verify that enquoteLiteral creates a valid literal and converts every + * single quote to two single quotes + */ + @Test(dataProvider = "validEnquotedNCharLiteralValues") + public void test07(String s, String expected) throws SQLException { + assertEquals(stmt.enquoteNCharLiteral(s), expected); + } + + /* + * Validate a NullPointerException is thrown if the string passed to + * enquoteNCharLiteral is null + */ + @Test(expectedExceptions = NullPointerException.class) + public void test08() throws SQLException { + stmt.enquoteNCharLiteral(null); + } + /* * DataProvider used to provide strings that will be used to validate * that enquoteLiteral converts a string to a literal and every instance of @@ -169,8 +187,7 @@ public class StatementTests extends BaseTest { {"\"Hel\"lo\"", true}, {"Hello" + '\0', false}, {"", false}, - {maxIdentifier + 'a', false}, - }; + {maxIdentifier + 'a', false},}; } /* @@ -194,4 +211,22 @@ public class StatementTests extends BaseTest { {"", false},}; } + /* + * DataProvider used to provide strings that will be used to validate + * that enquoteNCharLiteral converts a string to a National Character + * literal and every instance of + * a single quote will be converted into two single quotes in the literal. + */ + @DataProvider(name = "validEnquotedNCharLiteralValues") + protected Object[][] validEnquotedNCharLiteralValues() { + return new Object[][]{ + {"Hello", "N'Hello'"}, + {"G'Day", "N'G''Day'"}, + {"'G''Day'", "N'''G''''Day'''"}, + {"I'''M", "N'I''''''M'"}, + {"N'Hello'", "N'N''Hello'''"}, + {"The Dark Knight", "N'The Dark Knight'"} + + }; + } } From 9b77da0f46ebcb71802c3b5cd2e898d138168b22 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Mon, 4 Jan 2016 14:34:53 -0800 Subject: [PATCH 02/37] 8146431: j.u.z.ZipFile.getEntry("") throws AIOOBE Reviewed-by: lancea --- .../java.base/share/classes/java/util/zip/ZipFile.java | 2 +- jdk/test/java/util/zip/ZipFile/TestZipFile.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 9d9a776a010..31ff8eaf329 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 @@ -1251,7 +1251,7 @@ class ZipFile implements ZipConstants, Closeable { idx = getEntryNext(idx); } /* If not addSlash, or slash is already there, we are done */ - if (!addSlash || name[name.length - 1] == '/') { + if (!addSlash || name.length == 0 || name[name.length - 1] == '/') { return -1; } /* Add slash and try once more */ diff --git a/jdk/test/java/util/zip/ZipFile/TestZipFile.java b/jdk/test/java/util/zip/ZipFile/TestZipFile.java index 986877731db..515ed356c2b 100644 --- a/jdk/test/java/util/zip/ZipFile/TestZipFile.java +++ b/jdk/test/java/util/zip/ZipFile/TestZipFile.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8142508 + * @bug 8142508 8146431 * @summary Tests various ZipFile apis * @run main/manual TestZipFile */ @@ -216,6 +216,13 @@ public class TestZipFile { } static void doTest0(Zip zip, ZipFile zf) throws Throwable { + // (0) check zero-length entry name, no AIOOBE + try { + check(zf.getEntry("") == null);; + } catch (Throwable t) { + unexpected(t); + } + List list = new ArrayList(zip.entries.keySet()); // (1) check entry list, in expected order if (!check(Arrays.equals( From 7123bf01ab9abf6ca04a57c29cc6a81eb2b992fc Mon Sep 17 00:00:00 2001 From: Bhanu Prakash Gopularam Date: Mon, 4 Jan 2016 19:48:44 -0800 Subject: [PATCH 03/37] 8129560: TestKeyPairGenerator.java fails on Solaris because private exponent needs to comply with FIPS 186-4 Reviewed-by: mullan --- jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java index 6911dbef1b6..655edd3b5a2 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java @@ -107,7 +107,7 @@ public class TestKeyPairGenerator extends PKCS11Test { data = new byte[2048]; // keypair generation is very slow, test only a few short keys int[] keyLengths = {512, 512, 1024}; - BigInteger[] pubExps = {null, BigInteger.valueOf(3), null}; + BigInteger[] pubExps = {null, RSAKeyGenParameterSpec.F4, null}; KeyPair[] keyPairs = new KeyPair[3]; RandomFactory.getRandom().nextBytes(data); KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", provider); From 2cfdb952517459412ce488929e9b44910930b9f5 Mon Sep 17 00:00:00 2001 From: Nadeesh TV Date: Tue, 5 Jan 2016 10:09:48 -0500 Subject: [PATCH 04/37] 8145166: Duration.toString violates specification Correct Duration.toString method Reviewed-by: rriggs, scolebourne --- .../share/classes/java/time/Duration.java | 20 +++++++++++-------- .../java/time/tck/java/time/TCKDuration.java | 3 +++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/time/Duration.java b/jdk/src/java.base/share/classes/java/time/Duration.java index 334bfa0227a..d58ada0ed34 100644 --- a/jdk/src/java.base/share/classes/java/time/Duration.java +++ b/jdk/src/java.base/share/classes/java/time/Duration.java @@ -1385,7 +1385,7 @@ public final class Duration *

* The format of the returned string will be {@code PTnHnMnS}, where n is * the relevant hours, minutes or seconds part of the duration. - * Any fractional seconds are placed after a decimal point i the seconds section. + * Any fractional seconds are placed after a decimal point in the seconds section. * If a section has a zero value, it is omitted. * The hours, minutes and seconds will all have the same sign. *

@@ -1406,9 +1406,13 @@ public final class Duration if (this == ZERO) { return "PT0S"; } - long hours = seconds / SECONDS_PER_HOUR; - int minutes = (int) ((seconds % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE); - int secs = (int) (seconds % SECONDS_PER_MINUTE); + long effectiveTotalSecs = seconds; + if (seconds < 0 && nanos > 0) { + effectiveTotalSecs++; + } + long hours = effectiveTotalSecs / SECONDS_PER_HOUR; + int minutes = (int) ((effectiveTotalSecs % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE); + int secs = (int) (effectiveTotalSecs % SECONDS_PER_MINUTE); StringBuilder buf = new StringBuilder(24); buf.append("PT"); if (hours != 0) { @@ -1420,18 +1424,18 @@ public final class Duration if (secs == 0 && nanos == 0 && buf.length() > 2) { return buf.toString(); } - if (secs < 0 && nanos > 0) { - if (secs == -1) { + if (seconds < 0 && nanos > 0) { + if (secs == 0) { buf.append("-0"); } else { - buf.append(secs + 1); + buf.append(secs); } } else { buf.append(secs); } if (nanos > 0) { int pos = buf.length(); - if (secs < 0) { + if (seconds < 0) { buf.append(2 * NANOS_PER_SECOND - nanos); } else { buf.append(nanos + NANOS_PER_SECOND); diff --git a/jdk/test/java/time/tck/java/time/TCKDuration.java b/jdk/test/java/time/tck/java/time/TCKDuration.java index 1ef1302c6ff..40eefd0603c 100644 --- a/jdk/test/java/time/tck/java/time/TCKDuration.java +++ b/jdk/test/java/time/tck/java/time/TCKDuration.java @@ -2893,6 +2893,9 @@ public class TCKDuration extends AbstractTCKTest { {-1, 0, "PT-1S"}, {-1, 1000, "PT-0.999999S"}, {-1, 900000000, "PT-0.1S"}, + {-60, 100_000_000, "PT-59.9S"}, + {-59, -900_000_000, "PT-59.9S"}, + {-60, -100_000_000, "PT-1M-0.1S"}, {Long.MAX_VALUE, 0, "PT" + (Long.MAX_VALUE / 3600) + "H" + ((Long.MAX_VALUE % 3600) / 60) + "M" + (Long.MAX_VALUE % 60) + "S"}, {Long.MIN_VALUE, 0, "PT" + (Long.MIN_VALUE / 3600) + "H" + From 986ef090f10e398008576b0bbabe0ec4db850225 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Tue, 5 Jan 2016 18:53:27 +0100 Subject: [PATCH 05/37] 8146425: After change 8142907 'EXCLUDE_FILE' is wrongly interpreted as pattern Reviewed-by: erikj --- jdk/make/lib/NioLibraries.gmk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk index bc021b14d58..6b7d305f914 100644 --- a/jdk/make/lib/NioLibraries.gmk +++ b/jdk/make/lib/NioLibraries.gmk @@ -58,7 +58,10 @@ endif ifeq ($(OPENJDK_TARGET_OS), aix) BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) BUILD_LIBNIO_EXFILES += \ - NativeThread.c + /NativeThread.c + # Notice: we really need the leading slash here because otherwise every + # FILE_NAME in EXCLUDE_FILES will actually match any file ending in FILE_NAME + # (e.g. 'NativeThread.c' will also exclude 'AixNativeThread.c'). endif $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ From 3f8548453c54a2cef3077b42eab535c51edb3106 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Tue, 5 Jan 2016 10:15:54 -0800 Subject: [PATCH 06/37] 8039301: [ja] Host Locale Provider uses non-translated Calendar field names 8039969: Old Korean Calendar conflicts with Host Locale 8049835: [ar/HOST adapter] Hijri calendar era is used but date number follows gregorian 8054010: [HOST provider, not gregory] Return NULL when calling Calendar.getDisplayNames for Calendar.ERA 8054482: [HOST provider] only return standalone-style month display name 8055258: [HOST provider] Short era display name is not returned Reviewed-by: okutsu --- .../share/classes/java/util/Calendar.java | 8 +- .../java/util/JapaneseImperialCalendar.java | 20 +- .../HostLocaleProviderAdapterImpl.java | 93 ++++++- .../libjava/HostLocaleProviderAdapter_md.c | 257 +++++++++++++++--- .../java/util/Locale/LocaleProviders.java | 11 +- jdk/test/java/util/Locale/LocaleProviders.sh | 4 +- 6 files changed, 316 insertions(+), 77 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/util/Calendar.java b/jdk/src/java.base/share/classes/java/util/Calendar.java index 306362b203a..7665d84f3ce 100644 --- a/jdk/src/java.base/share/classes/java/util/Calendar.java +++ b/jdk/src/java.base/share/classes/java/util/Calendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2085,8 +2085,10 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable= 0 && value < names.length) { + return names[value]; + } else { + return null; + } + } + + @Override + public Map getDisplayNames(String calendarType, + int field, int style, Locale locale) { + Map map = null; + String[] names = getCalendarDisplayStrings(removeExtensions(locale).toLanguageTag(), + getCalendarIDFromLDMLType(calendarType), field, style); + if (names != null) { + map = new HashMap<>(); + for (int value = 0; value < names.length; value++) { + if (names[value] != null) { + map.put(names[value], value); + } + } + map = map.isEmpty() ? null : map; + } + return map; + } + }; + } + public static CalendarProvider getCalendarProvider() { return new CalendarProvider() { @Override @@ -496,15 +547,7 @@ public class HostLocaleProviderAdapterImpl { } private static boolean isSupportedCalendarLocale(Locale locale) { - Locale base = locale; - - if (base.hasExtensions() || base.getVariant() != "") { - // strip off extensions and variant. - base = new Locale.Builder() - .setLocale(locale) - .clearExtensions() - .build(); - } + Locale base = stripVariantAndExtensions(locale); if (!supportedLocaleSet.contains(base)) { return false; @@ -569,11 +612,23 @@ public class HostLocaleProviderAdapterImpl { } private static boolean isJapaneseCalendar() { - return getCalendarID("ja-JP") == 3; // 3: CAL_JAPAN + return getCalendarID("ja-JP") == CAL_JAPAN; + } + + private static Locale stripVariantAndExtensions(Locale locale) { + if (locale.hasExtensions() || locale.getVariant() != "") { + // strip off extensions and variant. + locale = new Locale.Builder() + .setLocale(locale) + .clearExtensions() + .build(); + } + + return locale; } private static Locale getCalendarLocale(Locale locale) { - int calid = getCalendarID(locale.toLanguageTag()); + int calid = getCalendarID(stripVariantAndExtensions(locale).toLanguageTag()); if (calid > 0 && calid < calIDToLDML.length) { Locale.Builder lb = new Locale.Builder(); String[] caltype = calIDToLDML[calid].split("_"); @@ -589,6 +644,15 @@ public class HostLocaleProviderAdapterImpl { return locale; } + private static int getCalendarIDFromLDMLType(String ldmlType) { + for (int i = 0; i < calIDToLDML.length; i++) { + if (calIDToLDML[i].startsWith(ldmlType)) { + return i; + } + } + return -1; + } + private static Locale getNumberLocale(Locale src) { if (JRELocaleConstants.TH_TH.equals(src)) { if (isNativeDigit("th-TH")) { @@ -639,6 +703,9 @@ public class HostLocaleProviderAdapterImpl { // For CalendarDataProvider private static native int getCalendarDataValue(String langTag, int type); + // For CalendarNameProvider + private static native String[] getCalendarDisplayStrings(String langTag, int calid, int field, int style); + // For Locale/CurrencyNameProvider private static native String getDisplayString(String langTag, int key, String value); } diff --git a/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c index f5540d764f3..28663f768b5 100644 --- a/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c +++ b/jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,22 +31,33 @@ #define BUFLEN 256 +// java.util.Calendar constants +#define CALENDAR_FIELD_ERA 0 // Calendar.ERA +#define CALENDAR_FIELD_MONTH 2 // Calendar.MONTH +#define CALENDAR_STYLE_SHORT_MASK 0x00000001 // Calendar.SHORT +#define CALENDAR_STYLE_STANDALONE_MASK 0x00008000 // Calendar.STANDALONE + // global variables typedef int (WINAPI *PGLIE)(const jchar *, LCTYPE, LPWSTR, int); typedef int (WINAPI *PGCIE)(const jchar *, CALID, LPCWSTR, CALTYPE, LPWSTR, int, LPDWORD); +typedef int (WINAPI *PECIEE)(CALINFO_ENUMPROCEXEX, const jchar *, CALID, LPCWSTR, CALTYPE, LPARAM); PGLIE pGetLocaleInfoEx; PGCIE pGetCalendarInfoEx; +PECIEE pEnumCalendarInfoExEx; BOOL initialized = FALSE; // prototypes int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen); int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CALTYPE type, LPWSTR data, int buflen, LPDWORD val); jint getCalendarID(const jchar *langtag); -void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jobjectArray jarray, - CALTYPE* pCalTypes, int offset, int length); +void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jint calid, jobjectArray jarray, + CALTYPE* pCalTypes, int offset, int length, int style); WCHAR * getNumberPattern(const jchar * langtag, const jint numberStyle); void getNumberPart(const jchar * langtag, const jint numberStyle, WCHAR * number); void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BOOL prefix, WCHAR * ret); +int enumCalendarInfoWrapper(const jchar * langtag, CALID calid, CALTYPE type, LPWSTR buf, int buflen); +BOOL CALLBACK EnumCalendarInfoProc(LPWSTR lpCalInfoStr, CALID calid, LPWSTR lpReserved, LPARAM lParam); +jobjectArray getErasImpl(JNIEnv *env, jstring jlangtag, jint calid, jint style, jobjectArray eras); // from java_props_md.c extern __declspec(dllexport) const char * getJavaIDFromLangID(LANGID langID); @@ -83,6 +94,8 @@ CALTYPE sMonthsType[] = { CAL_SABBREVMONTHNAME13, }; +#define MONTHTYPES (sizeof(monthsType) / sizeof(CALTYPE)) + CALTYPE wDaysType[] = { CAL_SDAYNAME7, CAL_SDAYNAME1, @@ -155,6 +168,11 @@ WCHAR * fixes[2][2][3][16] = } }; + +// Localized region name for unknown regions (Windows 10) +#define UNKNOWN_REGION L"Unknown Region (" +#define UNKNOWN_REGION_SIZE wcslen(UNKNOWN_REGION) + /* * Class: sun_util_locale_provider_HostLocaleProviderAdapterImpl * Method: initialize @@ -169,11 +187,15 @@ JNIEXPORT jboolean JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapt pGetCalendarInfoEx = (PGCIE)GetProcAddress( GetModuleHandle("kernel32.dll"), "GetCalendarInfoEx"); + pEnumCalendarInfoExEx = (PECIEE)GetProcAddress( + GetModuleHandle("kernel32.dll"), + "EnumCalendarInfoExEx"); initialized =TRUE; } return pGetLocaleInfoEx != NULL && - pGetCalendarInfoEx != NULL; + pGetCalendarInfoEx != NULL && + pEnumCalendarInfoExEx != NULL; } /* @@ -300,23 +322,7 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA */ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getEras (JNIEnv *env, jclass cls, jstring jlangtag, jobjectArray eras) { - WCHAR ad[BUFLEN]; - const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE); - jstring tmp_string; - CHECK_NULL_RETURN(langtag, eras); - - getCalendarInfoWrapper(langtag, getCalendarID(langtag), NULL, - CAL_SERASTRING, ad, BUFLEN, NULL); - - // Windows does not provide B.C. era. - tmp_string = (*env)->NewString(env, ad, (jsize)wcslen(ad)); - if (tmp_string != NULL) { - (*env)->SetObjectArrayElement(env, eras, 1, tmp_string); - } - - (*env)->ReleaseStringChars(env, jlangtag, langtag); - - return eras; + return getErasImpl(env, jlangtag, -1, 0, eras); } /* @@ -326,8 +332,8 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA */ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getMonths (JNIEnv *env, jclass cls, jstring jlangtag, jobjectArray months) { - replaceCalendarArrayElems(env, jlangtag, months, monthsType, - 0, sizeof(monthsType)/sizeof(CALTYPE)); + replaceCalendarArrayElems(env, jlangtag, -1, months, monthsType, + 0, MONTHTYPES, 0); return months; } @@ -338,8 +344,8 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA */ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getShortMonths (JNIEnv *env, jclass cls, jstring jlangtag, jobjectArray smonths) { - replaceCalendarArrayElems(env, jlangtag, smonths, sMonthsType, - 0, sizeof(sMonthsType)/sizeof(CALTYPE)); + replaceCalendarArrayElems(env, jlangtag, -1, smonths, sMonthsType, + 0, MONTHTYPES, 0); return smonths; } @@ -350,8 +356,8 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA */ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getWeekdays (JNIEnv *env, jclass cls, jstring jlangtag, jobjectArray wdays) { - replaceCalendarArrayElems(env, jlangtag, wdays, wDaysType, - 1, sizeof(wDaysType)/sizeof(CALTYPE)); + replaceCalendarArrayElems(env, jlangtag, -1, wdays, wDaysType, + 1, sizeof(wDaysType)/sizeof(CALTYPE), 0); return wdays; } @@ -362,8 +368,8 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA */ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getShortWeekdays (JNIEnv *env, jclass cls, jstring jlangtag, jobjectArray swdays) { - replaceCalendarArrayElems(env, jlangtag, swdays, sWDaysType, - 1, sizeof(sWDaysType)/sizeof(CALTYPE)); + replaceCalendarArrayElems(env, jlangtag, -1, swdays, sWDaysType, + 1, sizeof(sWDaysType)/sizeof(CALTYPE), 0); return swdays; } @@ -674,6 +680,41 @@ JNIEXPORT jint JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterIm } } +/* + * Class: sun_util_locale_provider_HostLocaleProviderAdapterImpl + * Method: getCalendarDisplayStrings + * Signature: (Ljava/lang/String;III)[Ljava/lang/String; + */ +JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getCalendarDisplayStrings + (JNIEnv *env, jclass cls, jstring jlangtag, jint calid, jint field, jint style) { + jobjectArray ret = NULL; + CALTYPE * pCalType = NULL; + + switch (field) { + case CALENDAR_FIELD_ERA: + return getErasImpl(env, jlangtag, calid, style, NULL); + + case CALENDAR_FIELD_MONTH: + ret = (*env)->NewObjectArray(env, MONTHTYPES, + (*env)->FindClass(env, "java/lang/String"), NULL); + if (ret != NULL) { + if (style & CALENDAR_STYLE_SHORT_MASK) { + pCalType = sMonthsType; + } else { + pCalType = monthsType; + } + + replaceCalendarArrayElems(env, jlangtag, calid, ret, pCalType, + 0, MONTHTYPES, style); + } + return ret; + + default: + // not supported + return NULL; + } +} + /* * Class: sun_util_locale_provider_HostLocaleProviderAdapterImpl * Method: getDisplayString @@ -714,10 +755,15 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte (*env)->ReleaseStringChars(env, jStr, pjChar); if (got) { - return (*env)->NewString(env, buf, (jsize)wcslen(buf)); - } else { - return NULL; + // Hack: Windows 10 returns "Unknown Region (XX)" for localized XX region name. + // Take that as not known. + if (type != sun_util_locale_provider_HostLocaleProviderAdapterImpl_DN_LOCALE_REGION || + wcsncmp(UNKNOWN_REGION, buf, UNKNOWN_REGION_SIZE) != 0) { + return (*env)->NewString(env, buf, (jsize)wcslen(buf)); + } } + + return NULL; } int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen) { @@ -753,35 +799,62 @@ int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CAL } jint getCalendarID(const jchar *langtag) { - DWORD type; + DWORD type = -1; int got = getLocaleInfoWrapper(langtag, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, (LPWSTR)&type, sizeof(type)); if (got) { - return type; - } else { - return 0; + switch (type) { + case CAL_GREGORIAN: + case CAL_GREGORIAN_US: + case CAL_JAPAN: + case CAL_TAIWAN: + case CAL_HIJRI: + case CAL_THAI: + case CAL_GREGORIAN_ME_FRENCH: + case CAL_GREGORIAN_ARABIC: + case CAL_GREGORIAN_XLIT_ENGLISH: + case CAL_GREGORIAN_XLIT_FRENCH: + case CAL_UMALQURA: + break; + + default: + // non-supported calendars return -1 + type = -1; + break; + } } + + return type; } -void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jobjectArray jarray, CALTYPE* pCalTypes, int offset, int length) { +void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jint calid, jobjectArray jarray, CALTYPE* pCalTypes, int offset, int length, int style) { WCHAR name[BUFLEN]; const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE); - int calid; jstring tmp_string; + CALTYPE isGenitive; CHECK_NULL(langtag); - calid = getCalendarID(langtag); + + if (calid < 0) { + calid = getCalendarID(langtag); + } if (calid != -1) { int i; + + if (!(style & CALENDAR_STYLE_STANDALONE_MASK)) { + isGenitive = CAL_RETURN_GENITIVE_NAMES; + } + for (i = 0; i < length; i++) { - getCalendarInfoWrapper(langtag, calid, NULL, - pCalTypes[i], name, BUFLEN, NULL); - tmp_string = (*env)->NewString(env, name, (jsize)wcslen(name)); - if (tmp_string != NULL) { - (*env)->SetObjectArrayElement(env, jarray, i + offset, tmp_string); + if (getCalendarInfoWrapper(langtag, calid, NULL, + pCalTypes[i] | isGenitive, name, BUFLEN, NULL) != 0) { + tmp_string = (*env)->NewString(env, name, (jsize)wcslen(name)); + if (tmp_string != NULL) { + (*env)->SetObjectArrayElement(env, jarray, i + offset, tmp_string); + } } } } @@ -924,3 +997,99 @@ void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BO wcscpy(ret, fixes[!prefix][!positive][style][pattern]); } + +int enumCalendarInfoWrapper(const jchar *langtag, CALID calid, CALTYPE type, LPWSTR buf, int buflen) { + if (pEnumCalendarInfoExEx) { + if (wcscmp(L"und", (LPWSTR)langtag) == 0) { + // defaults to "en" + return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, L"en", + calid, NULL, type, (LPARAM)buf); + } else { + return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, langtag, + calid, NULL, type, (LPARAM)buf); + } + } else { + return 0; + } +} + +BOOL CALLBACK EnumCalendarInfoProc(LPWSTR lpCalInfoStr, CALID calid, LPWSTR lpReserved, LPARAM lParam) { + wcscat_s((LPWSTR)lParam, BUFLEN, lpCalInfoStr); + wcscat_s((LPWSTR)lParam, BUFLEN, L","); + return TRUE; +} + +jobjectArray getErasImpl(JNIEnv *env, jstring jlangtag, jint calid, jint style, jobjectArray eras) { + const jchar * langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE); + WCHAR buf[BUFLEN]; + jobjectArray ret = eras; + CALTYPE type; + + CHECK_NULL_RETURN(langtag, ret); + + buf[0] = '\0'; + if (style & CALENDAR_STYLE_SHORT_MASK) { + type = CAL_SABBREVERASTRING; + } else { + type = CAL_SERASTRING; + } + + if (calid < 0) { + calid = getCalendarID(langtag); + } + + if (calid != -1 && enumCalendarInfoWrapper(langtag, calid, type, buf, BUFLEN)) { + // format in buf: "era0,era1,era2," where era0 is the current one + int eraCount; + LPWSTR current; + jsize array_length; + + for(eraCount = 0, current = buf; *current != '\0'; current++) { + if (*current == L',') { + eraCount ++; + } + } + + if (eras != NULL) { + array_length = (*env)->GetArrayLength(env, eras); + } else { + // +1 for the "before" era, e.g., BC, which Windows does not return. + array_length = (jsize)eraCount + 1; + ret = (*env)->NewObjectArray(env, array_length, + (*env)->FindClass(env, "java/lang/String"), NULL); + } + + if (ret != NULL) { + int eraIndex; + LPWSTR era; + + for(eraIndex = 0, era = current = buf; eraIndex < eraCount; era = current, eraIndex++) { + while (*current != L',') { + current++; + } + *current++ = '\0'; + + if (eraCount - eraIndex < array_length && + *era != '\0') { + (*env)->SetObjectArrayElement(env, ret, + (jsize)(eraCount - eraIndex), + (*env)->NewString(env, era, (jsize)wcslen(era))); + } + } + + // Hack for the Japanese Imperial Calendar to insert Gregorian era for + // "Before Meiji" + if (calid == CAL_JAPAN) { + buf[0] = '\0'; + if (enumCalendarInfoWrapper(langtag, CAL_GREGORIAN, type, buf, BUFLEN)) { + jsize len = (jsize)wcslen(buf); + buf[--len] = '\0'; // remove the last ',' + (*env)->SetObjectArrayElement(env, ret, 0, (*env)->NewString(env, buf, len)); + } + } + } + } + + (*env)->ReleaseStringChars(env, jlangtag, langtag); + return ret; +} diff --git a/jdk/test/java/util/Locale/LocaleProviders.java b/jdk/test/java/util/Locale/LocaleProviders.java index fe7b7085d20..230d11c320c 100644 --- a/jdk/test/java/util/Locale/LocaleProviders.java +++ b/jdk/test/java/util/Locale/LocaleProviders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -213,7 +213,7 @@ public class LocaleProviders { static void bug8013903Test() { if (System.getProperty("os.name").startsWith("Windows")) { Date sampleDate = new Date(0x10000000000L); - String fallbackResult = "Heisei 16.Nov.03 (Wed) AM 11:53:47"; + String hostResult = "\u5e73\u6210 16.11.03 (Wed) AM 11:53:47"; String jreResult = "\u5e73\u6210 16.11.03 (\u6c34) \u5348\u524d 11:53:47"; Locale l = new Locale("ja", "JP", "JP"); SimpleDateFormat sdf = new SimpleDateFormat("GGGG yyyy.MMM.dd '('E')' a hh:mm:ss", l); @@ -227,11 +227,10 @@ public class LocaleProviders { result + "\", expected: \"" + jreResult); } } else { - // should be FALLBACK, as Windows HOST does not return - // display names - if (!fallbackResult.equals(result)) { + // Windows display names. Subject to change if Windows changes its format. + if (!hostResult.equals(result)) { throw new RuntimeException("Format failed. result: \"" + - result + "\", expected: \"" + fallbackResult); + result + "\", expected: \"" + hostResult); } } } diff --git a/jdk/test/java/util/Locale/LocaleProviders.sh b/jdk/test/java/util/Locale/LocaleProviders.sh index fb8043e21c3..798fce5ce6d 100644 --- a/jdk/test/java/util/Locale/LocaleProviders.sh +++ b/jdk/test/java/util/Locale/LocaleProviders.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ # # @test # @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8008577 -# 8010666 8013086 8013233 8013903 8015960 8028771 8062006 +# 8010666 8013086 8013233 8013903 8015960 8028771 8054482 8062006 # @summary tests for "java.locale.providers" system property # @compile -XDignore.symbol.file LocaleProviders.java # @run shell/timeout=600 LocaleProviders.sh From e49fa68b05e2ccdf7058a86975c7addc989f4b06 Mon Sep 17 00:00:00 2001 From: Nadeesh TV Date: Tue, 5 Jan 2016 14:33:35 -0500 Subject: [PATCH 07/37] 8146489: @since tag missed Reviewed-by: lancea, rriggs --- jdk/src/java.base/share/classes/java/time/Duration.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/classes/java/time/Duration.java b/jdk/src/java.base/share/classes/java/time/Duration.java index d58ada0ed34..646d7109fd3 100644 --- a/jdk/src/java.base/share/classes/java/time/Duration.java +++ b/jdk/src/java.base/share/classes/java/time/Duration.java @@ -1194,6 +1194,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the whole seconds part of the length of the duration, positive or negative + * @since 9 */ public long toSeconds() { return seconds; @@ -1243,6 +1244,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the number of days in the duration, may be negative + * @since 9 */ public long toDaysPart(){ return seconds / SECONDS_PER_DAY; @@ -1258,6 +1260,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the number of hours part in the duration, may be negative + * @since 9 */ public int toHoursPart(){ return (int) (toHours() % 24); @@ -1273,7 +1276,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the number of minutes parts in the duration, may be negative - * may be negative + * @since 9 */ public int toMinutesPart(){ return (int) (toMinutes() % MINUTES_PER_HOUR); @@ -1289,6 +1292,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the number of seconds parts in the duration, may be negative + * @since 9 */ public int toSecondsPart(){ return (int) (seconds % SECONDS_PER_MINUTE); @@ -1306,6 +1310,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the number of milliseconds part of the duration. + * @since 9 */ public int toMillisPart(){ return nanos / 1000_000; @@ -1322,6 +1327,7 @@ public final class Duration * This instance is immutable and unaffected by this method call. * * @return the nanoseconds within the second part of the length of the duration, from 0 to 999,999,999 + * @since 9 */ public int toNanosPart(){ return nanos; From 119f59143f53ed2f5ab256feaa1f02c9adebab84 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Tue, 5 Jan 2016 13:57:32 -0800 Subject: [PATCH 08/37] 8050499: (ch) NativeSignal.signal fails with error 316 on OS X Do not throw an exception when ESRCH returned by pthread_kill() on OS X. Reviewed-by: alanb --- .../unix/native/libnio/ch/NativeThread.c | 6 +- .../DatagramChannel/StressNativeSignal.java | 147 ++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java diff --git a/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c b/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c index 5e2a78b7af3..fd20eeff79c 100644 --- a/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c +++ b/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -93,6 +93,10 @@ Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread) #else ret = pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL); #endif +#ifdef MACOSX + if (ret != 0 && ret != ESRCH) +#else if (ret != 0) +#endif JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed"); } diff --git a/jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java b/jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java new file mode 100644 index 00000000000..b21d68ab1a9 --- /dev/null +++ b/jdk/test/java/nio/channels/DatagramChannel/StressNativeSignal.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 8050499 + * @summary Attempt to provoke error 316 on OS X in NativeSignal.signal() + */ + +import java.io.*; +import java.net.*; +import java.nio.ByteBuffer; +import java.nio.channels.DatagramChannel; + +public class StressNativeSignal { + private UDPThread udpThread; + private ServerSocketThread serverSocketThread; + + StressNativeSignal() { + try { + serverSocketThread = new ServerSocketThread(); + serverSocketThread.start(); + + udpThread = new UDPThread(); + udpThread.start(); + } catch (Exception z) { + z.printStackTrace(); + } + } + + public static void main(String[] args) throws Throwable { + StressNativeSignal test = new StressNativeSignal(); + try { + Thread.sleep(3000); + } catch (Exception z) { + z.printStackTrace(System.err); + } + + test.shutdown(); + } + + public void shutdown() { + udpThread.terminate(); + try { + udpThread.join(); + } catch (Exception z) { + z.printStackTrace(System.err); + } + + serverSocketThread.terminate(); + try { + serverSocketThread.join(); + } catch (Exception z) { + z.printStackTrace(System.err); + } + } + + public class ServerSocketThread extends Thread { + private volatile boolean shouldTerminate; + private ServerSocket socket; + + public void run() { + try { + socket = new ServerSocket(1122); + Socket client = socket.accept(); + BufferedReader reader = new BufferedReader(new InputStreamReader(client.getInputStream())); + shouldTerminate = false; + while (!shouldTerminate) { + String msg = reader.readLine(); + } + } catch (Exception z) { + if (!shouldTerminate) { + z.printStackTrace(System.err); + } + } + } + + public void terminate() { + shouldTerminate = true; + try { + socket.close(); + } catch (Exception z) { + z.printStackTrace(System.err); + // ignore + } + } + } + + public class UDPThread extends Thread { + private DatagramChannel channel; + private volatile boolean shouldTerminate; + + @Override + public void run() { + try { + channel = DatagramChannel.open(); + channel.setOption(StandardSocketOptions.SO_RCVBUF, 6553600); + channel.bind(new InetSocketAddress(19870)); + } catch (IOException z) { + z.printStackTrace(System.err); + } + + ByteBuffer buf = ByteBuffer.allocate(6553600); + shouldTerminate = false; + while (!shouldTerminate) { + try { + buf.rewind(); + channel.receive(buf); + } catch (IOException z) { + if (!shouldTerminate) { + z.printStackTrace(System.err); + } + } + } + } + + public void terminate() { + shouldTerminate = true; + try { + channel.close(); + } catch (Exception z) { + z.printStackTrace(System.err); + // ignore + } + } + } + +} From 67393822992b4ad64cd18126e8d9c9ec4884f001 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Tue, 5 Jan 2016 16:03:36 -0800 Subject: [PATCH 09/37] 8146359: test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java fails when nc is not available Check for presence of netcat command using 'which' before running test Reviewed-by: alanb --- .../BasicFileAttributeView/UnixSocketFile.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java b/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java index caa712ebb2a..76415804693 100644 --- a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java +++ b/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ */ import java.io.File; +import java.io.InputStream; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.FileSystems; @@ -49,6 +50,17 @@ public class UnixSocketFile { public static void main(String[] args) throws InterruptedException, IOException { + // Use 'which' to verify that 'nc' is available and skip the test + // if it is not. + Process proc = Runtime.getRuntime().exec("which nc"); + InputStream stdout = proc.getInputStream(); + int b = stdout.read(); + proc.destroy(); + if (b == -1) { + System.err.println("Netcat command unavailable; skipping test."); + return; + } + // Create a new sub-directory of the nominal test directory in which // 'nc' will create the socket file. String testSubDir = System.getProperty("test.dir", ".") @@ -62,7 +74,6 @@ public class UnixSocketFile { // Create a process which executes the nc (netcat) utility to create // a socket file at the indicated location. - Process proc; FileSystem fs = FileSystems.getDefault(); try (WatchService ws = fs.newWatchService()) { // Watch the test sub-directory to receive notification when an From aa0ef2e9f51055eabe1c8c28baef08f63a911342 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 6 Jan 2016 10:01:44 +0000 Subject: [PATCH 10/37] 8145544: Move sun.misc.VM to jdk.internal.misc Reviewed-by: alanb, mullan, weijun --- jdk/make/mapfiles/libjava/mapfile-vers | 12 ++++++------ .../share/classes/java/io/ObjectInputStream.java | 2 +- jdk/src/java.base/share/classes/java/lang/Class.java | 5 +++-- .../java.base/share/classes/java/lang/Integer.java | 5 +++-- .../share/classes/java/lang/StackStreamFactory.java | 2 +- .../java.base/share/classes/java/lang/System.java | 11 ++++++----- .../java.base/share/classes/java/lang/Thread.java | 2 +- .../share/classes/java/lang/ThreadGroup.java | 2 +- .../java.base/share/classes/java/lang/Throwable.java | 2 +- .../classes/java/lang/invoke/MethodHandles.java | 2 +- .../share/classes/java/lang/ref/Finalizer.java | 2 +- .../share/classes/java/lang/ref/ReferenceQueue.java | 5 +++-- .../share/classes/java/lang/reflect/Proxy.java | 2 +- jdk/src/java.base/share/classes/java/net/URL.java | 2 +- jdk/src/java.base/share/classes/java/nio/Bits.java | 2 +- .../classes/java/nio/Direct-X-Buffer.java.template | 2 +- .../share/classes/java/nio/charset/Charset.java | 7 ++++--- jdk/src/java.base/share/classes/java/time/Clock.java | 2 +- .../classes/jdk/internal/logger/BootstrapLogger.java | 2 +- .../classes/jdk/internal/logger/LazyLoggers.java | 2 +- .../share/classes/jdk/internal/misc/Unsafe.java | 2 +- .../share/classes/{sun => jdk/internal}/misc/VM.java | 2 +- .../{sun => jdk/internal}/misc/VMNotification.java | 2 +- .../share/classes/sun/launcher/LauncherHelper.java | 5 +++-- jdk/src/java.base/share/classes/sun/misc/Unsafe.java | 1 + jdk/src/java.base/share/classes/sun/nio/ch/Util.java | 2 +- .../sun/nio/cs/StandardCharsets.java.template | 4 ++-- .../share/classes/sun/reflect/Reflection.java | 3 ++- jdk/src/java.base/share/native/libjava/VM.c | 10 +++++----- .../{sun => jdk/internal}/misc/OSEnvironment.java | 4 ++-- jdk/src/java.base/unix/native/libjava/VM_md.c | 8 ++++---- .../{sun => jdk/internal}/misc/OSEnvironment.java | 4 ++-- .../windows/classes/sun/io/Win32ErrorMode.java | 2 +- jdk/src/java.base/windows/native/libjava/VM_md.c | 8 ++++---- .../share/classes/java/util/logging/FileHandler.java | 2 +- .../java/lang/management/ManagementFactory.java | 2 +- .../sun/management/ManagementFactoryHelper.java | 2 +- .../share/classes/sun/management/MemoryImpl.java | 2 +- .../classes/sun/rmi/server/MarshalInputStream.java | 2 +- .../krb5/internal/ccache/FileCredentialsCache.java | 2 +- .../sun/security/krb5/internal/rcache/DflCache.java | 4 ++-- .../sun/nio/cs/ext/ExtendedCharsets.java.template | 2 +- .../java/lang/management/MemoryMXBean/Pending.java | 6 +++--- .../internal}/misc/VM/GetNanoTimeAdjustment.java | 4 ++-- .../sun/security/krb5/auto/ReplayCacheTestProc.java | 2 +- jdk/test/sun/security/krb5/auto/TEST.properties | 3 ++- 46 files changed, 86 insertions(+), 77 deletions(-) rename jdk/src/java.base/share/classes/{sun => jdk/internal}/misc/VM.java (99%) rename jdk/src/java.base/share/classes/{sun => jdk/internal}/misc/VMNotification.java (98%) rename jdk/src/java.base/unix/classes/{sun => jdk/internal}/misc/OSEnvironment.java (92%) rename jdk/src/java.base/windows/classes/{sun => jdk/internal}/misc/OSEnvironment.java (93%) rename jdk/test/{sun => jdk/internal}/misc/VM/GetNanoTimeAdjustment.java (99%) diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index dd7e58a6b2e..ac1be88ebe6 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -274,12 +274,12 @@ SUNWprivate_1.1 { Java_sun_reflect_Reflection_getClassAccessFlags; Java_sun_misc_Version_getJdkVersionInfo; Java_sun_misc_Version_getJvmVersionInfo; - Java_sun_misc_VM_latestUserDefinedLoader; - Java_sun_misc_VM_getuid; - Java_sun_misc_VM_geteuid; - Java_sun_misc_VM_getgid; - Java_sun_misc_VM_getegid; - Java_sun_misc_VM_initialize; + Java_jdk_internal_misc_VM_latestUserDefinedLoader; + Java_jdk_internal_misc_VM_getuid; + Java_jdk_internal_misc_VM_geteuid; + Java_jdk_internal_misc_VM_getgid; + Java_jdk_internal_misc_VM_getegid; + Java_jdk_internal_misc_VM_initialize; Java_sun_misc_VMSupport_initAgentProperties; Java_sun_misc_VMSupport_getVMTemporaryDirectory; diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java index 779257e87c0..d739bc411e1 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -2135,7 +2135,7 @@ public class ObjectInputStream * corresponding modifications to the above class. */ private static ClassLoader latestUserDefinedLoader() { - return sun.misc.VM.latestUserDefinedLoader(); + return jdk.internal.misc.VM.latestUserDefinedLoader(); } /** diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java index 013b5843a1e..af75faf371a 100644 --- a/jdk/src/java.base/share/classes/java/lang/Class.java +++ b/jdk/src/java.base/share/classes/java/lang/Class.java @@ -56,6 +56,7 @@ import java.util.HashMap; import java.util.Objects; import java.util.StringJoiner; import jdk.internal.misc.Unsafe; +import jdk.internal.misc.VM; import jdk.internal.HotSpotIntrinsicCandidate; import sun.reflect.CallerSensitive; import sun.reflect.ConstantPool; @@ -360,9 +361,9 @@ public final class Class implements java.io.Serializable, // Reflective call to get caller class is only needed if a security manager // is present. Avoid the overhead of making this call otherwise. caller = Reflection.getCallerClass(); - if (sun.misc.VM.isSystemDomainLoader(loader)) { + if (VM.isSystemDomainLoader(loader)) { ClassLoader ccl = ClassLoader.getClassLoader(caller); - if (!sun.misc.VM.isSystemDomainLoader(ccl)) { + if (!VM.isSystemDomainLoader(ccl)) { sm.checkPermission( SecurityConstants.GET_CLASSLOADER_PERMISSION); } diff --git a/jdk/src/java.base/share/classes/java/lang/Integer.java b/jdk/src/java.base/share/classes/java/lang/Integer.java index e34ae9d9395..11afbef0d47 100644 --- a/jdk/src/java.base/share/classes/java/lang/Integer.java +++ b/jdk/src/java.base/share/classes/java/lang/Integer.java @@ -28,6 +28,7 @@ package java.lang; import java.lang.annotation.Native; import java.util.Objects; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; import static java.lang.String.COMPACT_STRINGS; import static java.lang.String.LATIN1; @@ -1018,7 +1019,7 @@ public final class Integer extends Number implements Comparable { * may be controlled by the {@code -XX:AutoBoxCacheMax=} option. * During VM initialization, java.lang.Integer.IntegerCache.high property * may be set and saved in the private system properties in the - * sun.misc.VM class. + * jdk.internal.misc.VM class. */ private static class IntegerCache { @@ -1030,7 +1031,7 @@ public final class Integer extends Number implements Comparable { // high value may be configured by property int h = 127; String integerCacheHighPropValue = - sun.misc.VM.getSavedProperty("java.lang.Integer.IntegerCache.high"); + VM.getSavedProperty("java.lang.Integer.IntegerCache.high"); if (integerCacheHighPropValue != null) { try { int i = parseInt(integerCacheHighPropValue); diff --git a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java index 34c60a755d0..dcb471c4cc2 100644 --- a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java +++ b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java @@ -24,7 +24,7 @@ */ package java.lang; -import sun.misc.VM; +import jdk.internal.misc.VM; import java.io.PrintStream; import java.lang.StackWalker.Option; diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java index ea3ad405cfc..8ea79588235 100644 --- a/jdk/src/java.base/share/classes/java/lang/System.java +++ b/jdk/src/java.base/share/classes/java/lang/System.java @@ -46,6 +46,7 @@ import sun.reflect.annotation.AnnotationType; import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.misc.JavaLangAccess;; import jdk.internal.misc.SharedSecrets;; +import jdk.internal.misc.VM; import jdk.internal.logger.LoggerFinderLoader; import jdk.internal.logger.LazyLoggers; import jdk.internal.logger.LocalizedLoggerWrapper; @@ -1817,12 +1818,12 @@ public final class System { // removed from the system properties. // // See java.lang.Integer.IntegerCache and the - // sun.misc.VM.saveAndRemoveProperties method for example. + // VM.saveAndRemoveProperties method for example. // // Save a private copy of the system properties object that // can only be accessed by the internal implementation. Remove // certain system properties that are not intended for public access. - sun.misc.VM.saveAndRemoveProperties(props); + VM.saveAndRemoveProperties(props); lineSeparator = props.getProperty("line.separator"); @@ -1846,7 +1847,7 @@ public final class System { // set for the class libraries. Currently this is no-op everywhere except // for Windows where the process-wide error mode is set before the java.io // classes are used. - sun.misc.VM.initializeOSEnvironment(); + VM.initializeOSEnvironment(); // The main thread is not added to its thread group in the same // way as other threads; we must do it ourselves here. @@ -1857,10 +1858,10 @@ public final class System { setJavaLangAccess(); // Subsystems that are invoked during initialization can invoke - // sun.misc.VM.isBooted() in order to avoid doing things that should + // VM.isBooted() in order to avoid doing things that should // wait until the application class loader has been set up. // IMPORTANT: Ensure that this remains the last initialization action! - sun.misc.VM.booted(); + VM.booted(); } private static void setJavaLangAccess() { diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java index 56935eabd34..eb47a05427d 100644 --- a/jdk/src/java.base/share/classes/java/lang/Thread.java +++ b/jdk/src/java.base/share/classes/java/lang/Thread.java @@ -1869,7 +1869,7 @@ class Thread implements Runnable { */ public State getState() { // get current thread state - return sun.misc.VM.toThreadState(threadStatus); + return jdk.internal.misc.VM.toThreadState(threadStatus); } // Added in JSR-166 diff --git a/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java b/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java index eda2e7d1ab8..e477800f61c 100644 --- a/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java +++ b/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java @@ -27,7 +27,7 @@ package java.lang; import java.io.PrintStream; import java.util.Arrays; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * A thread group represents a set of threads. In addition, a thread diff --git a/jdk/src/java.base/share/classes/java/lang/Throwable.java b/jdk/src/java.base/share/classes/java/lang/Throwable.java index 68dc204693b..9d5f547c2a5 100644 --- a/jdk/src/java.base/share/classes/java/lang/Throwable.java +++ b/jdk/src/java.base/share/classes/java/lang/Throwable.java @@ -24,7 +24,7 @@ */ package java.lang; -import sun.misc.VM; +import jdk.internal.misc.VM; import java.io.*; import java.util.*; diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 0c8317db5c1..1448ded8b03 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -1836,7 +1836,7 @@ return mh1; return false; } ClassLoader loader = defc.getClassLoader(); - if (!sun.misc.VM.isSystemDomainLoader(loader)) { + if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) { ClassLoader sysl = ClassLoader.getSystemClassLoader(); boolean found = false; while (sysl != null) { diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java index 221d07e207b..ead17ef1c9f 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java @@ -29,7 +29,7 @@ import java.security.PrivilegedAction; import java.security.AccessController; import jdk.internal.misc.JavaLangAccess; import jdk.internal.misc.SharedSecrets; -import sun.misc.VM; +import jdk.internal.misc.VM; final class Finalizer extends FinalReference { /* Package-private; must be in same package as the Reference diff --git a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java index dcd50ae8575..61f43791400 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java @@ -26,6 +26,7 @@ package java.lang.ref; import java.util.function.Consumer; +import jdk.internal.misc.VM; /** * Reference queues, to which registered reference objects are appended by the @@ -73,7 +74,7 @@ public class ReferenceQueue { // Volatiles ensure ordering. r.queue = ENQUEUED; if (r instanceof FinalReference) { - sun.misc.VM.addFinalRefCount(1); + VM.addFinalRefCount(1); } lock.notifyAll(); return true; @@ -93,7 +94,7 @@ public class ReferenceQueue { r.next = r; queueLength--; if (r instanceof FinalReference) { - sun.misc.VM.addFinalRefCount(-1); + VM.addFinalRefCount(-1); } return r; } diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java index 765713a4afd..f6c6ebd4d2f 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiFunction; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; import sun.reflect.misc.ReflectUtil; diff --git a/jdk/src/java.base/share/classes/java/net/URL.java b/jdk/src/java.base/share/classes/java/net/URL.java index 73e488831a5..e8a694116fd 100644 --- a/jdk/src/java.base/share/classes/java/net/URL.java +++ b/jdk/src/java.base/share/classes/java/net/URL.java @@ -1242,7 +1242,7 @@ public final class URL implements java.io.Serializable { private static ThreadLocal gate = new ThreadLocal<>(); private static URLStreamHandler lookupViaProviders(final String protocol) { - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return null; if (gate.get() != null) diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java index 724fb0c01f5..09623eab845 100644 --- a/jdk/src/java.base/share/classes/java/nio/Bits.java +++ b/jdk/src/java.base/share/classes/java/nio/Bits.java @@ -31,7 +31,7 @@ import jdk.internal.misc.JavaNioAccess; import jdk.internal.misc.JavaLangRefAccess; import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.Unsafe; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * Access to bits, native and otherwise. diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template index c2d8d8ea12e..16e495a4fba 100644 --- a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template @@ -30,7 +30,7 @@ package java.nio; import java.io.FileDescriptor; import sun.misc.Cleaner; import jdk.internal.misc.Unsafe; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.nio.ch.DirectBuffer; diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java index d48f5a972db..de85b2f525c 100644 --- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java +++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java @@ -43,6 +43,7 @@ import java.util.ServiceLoader; import java.util.ServiceConfigurationError; import java.util.SortedMap; import java.util.TreeMap; +import jdk.internal.misc.VM; import sun.misc.ASCIICaseInsensitiveComparator; import sun.nio.cs.StandardCharsets; import sun.nio.cs.ThreadLocalCoders; @@ -281,7 +282,7 @@ public abstract class Charset static boolean atBugLevel(String bl) { // package-private String level = bugLevel; if (level == null) { - if (!sun.misc.VM.isBooted()) + if (!VM.isBooted()) return false; bugLevel = level = AccessController.doPrivileged( new GetPropertyAction("sun.nio.cs.bugLevel", "")); @@ -394,7 +395,7 @@ public abstract class Charset // that loader to be prematurely initialized with incomplete // information. // - if (!sun.misc.VM.isBooted()) + if (!VM.isBooted()) return null; if (gate.get() != null) @@ -445,7 +446,7 @@ public abstract class Charset } private static Charset lookupExtendedCharset(String charsetName) { - if (!sun.misc.VM.isBooted()) // see lookupViaProviders() + if (!VM.isBooted()) // see lookupViaProviders() return null; CharsetProvider[] ecps = ExtendedProviderHolder.extendedProviders; for (CharsetProvider cp : ecps) { diff --git a/jdk/src/java.base/share/classes/java/time/Clock.java b/jdk/src/java.base/share/classes/java/time/Clock.java index 0d02c524dd0..121afa3730b 100644 --- a/jdk/src/java.base/share/classes/java/time/Clock.java +++ b/jdk/src/java.base/share/classes/java/time/Clock.java @@ -69,7 +69,7 @@ import static java.time.LocalTime.NANOS_PER_MILLI; import java.io.Serializable; import java.util.Objects; import java.util.TimeZone; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * A clock providing access to the current instant, date and time using a time-zone. diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java b/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java index 813c4787e86..bf2bccf9e1e 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java +++ b/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java @@ -48,7 +48,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import sun.misc.InnocuousThread; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.util.logging.PlatformLogger; import jdk.internal.logger.LazyLoggers.LazyLoggerAccessor; diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java b/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java index c54fc1a55ff..04b64ea98b1 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java +++ b/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java @@ -32,7 +32,7 @@ import java.lang.System.LoggerFinder; import java.lang.System.Logger; import java.lang.ref.WeakReference; import java.util.Objects; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.util.logging.PlatformLogger; /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java index 83bb4f34ff1..9176784def0 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java @@ -30,7 +30,7 @@ import java.security.ProtectionDomain; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; -import sun.misc.VM; +import jdk.internal.misc.VM; import jdk.internal.HotSpotIntrinsicCandidate; diff --git a/jdk/src/java.base/share/classes/sun/misc/VM.java b/jdk/src/java.base/share/classes/jdk/internal/misc/VM.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/misc/VM.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/VM.java index 4c83dfaf049..04af46a49f9 100644 --- a/jdk/src/java.base/share/classes/sun/misc/VM.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/VM.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import static java.lang.Thread.State.*; import java.util.Properties; diff --git a/jdk/src/java.base/share/classes/sun/misc/VMNotification.java b/jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/VMNotification.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java index bf4abef3432..3c7ad9b4891 100644 --- a/jdk/src/java.base/share/classes/sun/misc/VMNotification.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; /** @deprecated */ @Deprecated diff --git a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java index 5845979b1a5..3f9e3668e69 100644 --- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java +++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java @@ -66,6 +66,7 @@ import java.util.TreeSet; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; +import jdk.internal.misc.VM; public enum LauncherHelper { INSTANCE; @@ -86,9 +87,9 @@ public enum LauncherHelper { private static final String PROP_SETTINGS = "Property settings:"; private static final String LOCALE_SETTINGS = "Locale settings:"; - // sync with java.c and sun.misc.VM + // sync with java.c and jdk.internal.misc.VM private static final String diagprop = "sun.java.launcher.diag"; - static final boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null; + static final boolean trace = VM.getSavedProperty(diagprop) != null; private static final String defaultBundleName = "sun.launcher.resources.launcher"; diff --git a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java index 6a4775a4c3a..e07dc31262f 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java @@ -32,6 +32,7 @@ import sun.reflect.CallerSensitive; import sun.reflect.Reflection; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; /** diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Util.java b/jdk/src/java.base/share/classes/sun/nio/ch/Util.java index bb8df722927..3b8d814bcd1 100644 --- a/jdk/src/java.base/share/classes/sun/nio/ch/Util.java +++ b/jdk/src/java.base/share/classes/sun/nio/ch/Util.java @@ -389,7 +389,7 @@ public class Util { static boolean atBugLevel(String bl) { // package-private if (bugLevel == null) { - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return false; String value = AccessController.doPrivileged( new GetPropertyAction("sun.nio.ch.bugLevel")); diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template b/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template index 63a5dc62139..dd4d3994240 100644 --- a/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template +++ b/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template @@ -156,12 +156,12 @@ public class StandardCharsets extends CharsetProvider { private boolean initialized = false; - /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack + /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack */ private void init() { if (initialized) return; - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return; initialized = true; diff --git a/jdk/src/java.base/share/classes/sun/reflect/Reflection.java b/jdk/src/java.base/share/classes/sun/reflect/Reflection.java index c7c8ded287d..07ff36493d2 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/Reflection.java +++ b/jdk/src/java.base/share/classes/sun/reflect/Reflection.java @@ -29,6 +29,7 @@ import java.lang.reflect.*; import java.util.HashMap; import java.util.Map; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; /** Common utility routines used by both java.lang and java.lang.reflect */ @@ -335,7 +336,7 @@ public class Reflection { */ public static boolean isCallerSensitive(Method m) { final ClassLoader loader = m.getDeclaringClass().getClassLoader(); - if (sun.misc.VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) { + if (VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) { return m.isAnnotationPresent(CallerSensitive.class); } return false; diff --git a/jdk/src/java.base/share/native/libjava/VM.c b/jdk/src/java.base/share/native/libjava/VM.c index 440ed456ada..61bae65f815 100644 --- a/jdk/src/java.base/share/native/libjava/VM.c +++ b/jdk/src/java.base/share/native/libjava/VM.c @@ -28,7 +28,7 @@ #include "jvm.h" #include "jdk_util.h" -#include "sun_misc_VM.h" +#include "jdk_internal_misc_VM.h" /* Only register the performance-critical methods */ static JNINativeMethod methods[] = { @@ -36,12 +36,12 @@ static JNINativeMethod methods[] = { }; JNIEXPORT jobject JNICALL -Java_sun_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) { +Java_jdk_internal_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) { return JVM_LatestUserDefinedLoader(env); } JNIEXPORT void JNICALL -Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) { +Java_jdk_internal_misc_VM_initialize(JNIEnv *env, jclass cls) { if (!JDK_InitJvmHandle()) { JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup"); return; @@ -50,8 +50,8 @@ Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) { // Registers implementations of native methods described in methods[] // above. // In particular, registers JVM_GetNanoTimeAdjustment as the implementation - // of the native sun.misc.VM.getNanoTimeAdjustment - avoiding the cost of - // introducing a Java_sun_misc_VM_getNanoTimeAdjustment wrapper + // of the native VM.getNanoTimeAdjustment - avoiding the cost of + // introducing a Java_jdk_internal_misc_VM_getNanoTimeAdjustment wrapper (*env)->RegisterNatives(env, cls, methods, sizeof(methods)/sizeof(methods[0])); } diff --git a/jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java similarity index 92% rename from jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java rename to jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java index 5004fd17739..506273a5762 100644 --- a/jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java +++ b/jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java @@ -23,12 +23,12 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; public class OSEnvironment { /* - * Initialize any miscellenous operating system settings that need to be set + * Initialize any miscellaneous operating system settings that need to be set * for the class libraries. */ public static void initialize() { diff --git a/jdk/src/java.base/unix/native/libjava/VM_md.c b/jdk/src/java.base/unix/native/libjava/VM_md.c index 48a8e4a954b..fc6edf04ce1 100644 --- a/jdk/src/java.base/unix/native/libjava/VM_md.c +++ b/jdk/src/java.base/unix/native/libjava/VM_md.c @@ -28,25 +28,25 @@ JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) { return getuid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { return geteuid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) { return getgid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) { return getegid(); } diff --git a/jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java similarity index 93% rename from jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java rename to jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java index 0e3cc4f1425..ffc8cf41804 100644 --- a/jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java +++ b/jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java @@ -23,14 +23,14 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import sun.io.Win32ErrorMode; public class OSEnvironment { /* - * Initialize any miscellenous operating system settings that need to be set + * Initialize any miscellaneous operating system settings that need to be set * for the class libraries. *

* At this time only the process-wide error mode needs to be set. diff --git a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java index 18626a76462..324a04db8eb 100644 --- a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java +++ b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java @@ -66,7 +66,7 @@ public class Win32ErrorMode { * has completed. */ public static void initialize() { - if (!sun.misc.VM.isBooted()) { + if (!jdk.internal.misc.VM.isBooted()) { String s = System.getProperty("sun.io.allowCriticalErrorMessageBox"); if (s == null || s.equals(Boolean.FALSE.toString())) { long mode = setErrorMode(0); diff --git a/jdk/src/java.base/windows/native/libjava/VM_md.c b/jdk/src/java.base/windows/native/libjava/VM_md.c index 2b13ffc4f37..73011d123dd 100644 --- a/jdk/src/java.base/windows/native/libjava/VM_md.c +++ b/jdk/src/java.base/windows/native/libjava/VM_md.c @@ -27,28 +27,28 @@ JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; diff --git a/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java index 52a2b4e07e6..61b0c817818 100644 --- a/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java +++ b/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java @@ -639,7 +639,7 @@ public class FileHandler extends StreamHandler { continue; } else if (ch2 == 'h') { file = new File(System.getProperty("user.home")); - if (sun.misc.VM.isSetUID()) { + if (jdk.internal.misc.VM.isSetUID()) { // Ok, we are in a set UID program. For safety's sake // we disallow attempts to open files relative to %h. throw new IOException("can't use %h in set UID program"); diff --git a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java index 47b244910a4..24c848800fd 100644 --- a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java +++ b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java @@ -583,7 +583,7 @@ public class ManagementFactory { ClassLoader loader = AccessController.doPrivileged( (PrivilegedAction) () -> cls.getClassLoader()); - if (!sun.misc.VM.isSystemDomainLoader(loader)) { + if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) { throw new IllegalArgumentException(mxbeanName + " is not a platform MXBean"); } diff --git a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java index 22b69401199..44682b29971 100644 --- a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java +++ b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java @@ -473,7 +473,7 @@ public class ManagementFactoryHelper { public static Thread.State toThreadState(int state) { // suspended and native bits may be set in state int threadStatus = state & ~JMM_THREAD_STATE_FLAG_MASK; - return sun.misc.VM.toThreadState(threadStatus); + return jdk.internal.misc.VM.toThreadState(threadStatus); } // These values are defined in jmm.h diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java b/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java index f64a0a5bcf4..00d68d4a022 100644 --- a/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java +++ b/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java @@ -59,7 +59,7 @@ class MemoryImpl extends NotificationEmitterSupport } public int getObjectPendingFinalizationCount() { - return sun.misc.VM.getFinalRefCount(); + return jdk.internal.misc.VM.getFinalRefCount(); } public void gc() { diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java index 20f8874a72a..3453e61f517 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java @@ -262,7 +262,7 @@ public class MarshalInputStream extends ObjectInputStream { * if only code from the null class loader is on the stack. */ private static ClassLoader latestUserDefinedLoader() { - return sun.misc.VM.latestUserDefinedLoader(); + return jdk.internal.misc.VM.latestUserDefinedLoader(); } /** diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java index 7d0e700d820..f22a1883c0b 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java @@ -397,7 +397,7 @@ public class FileCredentialsCache extends CredentialsCache */ if (osname != null && !osname.startsWith("Windows")) { - long uid = sun.misc.VM.getuid(); + long uid = jdk.internal.misc.VM.getuid(); if (uid != -1) { name = File.separator + "tmp" + File.separator + stdCacheNameComponent + "_" + uid; diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java index cbae7026cec..54fa34add04 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java @@ -60,7 +60,7 @@ import sun.security.krb5.internal.ReplayCache; * * service_euid * - * in which euid is available as sun.misc.VM.geteuid(). + * in which euid is available as jdk.internal.misc.VM.geteuid(). * * The file has a header: * @@ -107,7 +107,7 @@ public class DflCache extends ReplayCache { private static long uid; static { // Available on Solaris, Linux and Mac. Otherwise, -1 and no _euid suffix - uid = sun.misc.VM.geteuid(); + uid = jdk.internal.misc.VM.geteuid(); } public DflCache (String source) { diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template index f654c778b81..4bca8abb83d 100644 --- a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template +++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template @@ -97,7 +97,7 @@ public class ExtendedCharsets extends AbstractCharsetProvider { protected void init() { if (initialized) return; - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return; String map = getProperty("sun.nio.cs.map"); diff --git a/jdk/test/java/lang/management/MemoryMXBean/Pending.java b/jdk/test/java/lang/management/MemoryMXBean/Pending.java index 728ff15a5b9..156708249d5 100644 --- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java +++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java @@ -24,7 +24,7 @@ /* * @test * @bug 4530538 - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * java.management * @summary Basic unit test of * RuntimeMXBean.getObjectPendingFinalizationCount() @@ -50,10 +50,10 @@ public class Pending { private static void printFinalizerInstanceCount() { if (!trace) return; - int count = sun.misc.VM.getFinalRefCount(); + int count = jdk.internal.misc.VM.getFinalRefCount(); System.out.println(INDENT + "Finalizable object Count = " + count); - count = sun.misc.VM.getPeakFinalRefCount(); + count = jdk.internal.misc.VM.getPeakFinalRefCount(); System.out.println(INDENT + "Peak Finalizable object Count = " + count); } diff --git a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java b/jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java similarity index 99% rename from jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java rename to jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java index d92cba9eaca..964352522a3 100644 --- a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java +++ b/jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java @@ -21,13 +21,13 @@ * questions. */ import java.util.Objects; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * @test * @bug 8068730 * @summary tests that VM.getgetNanoTimeAdjustment() works as expected. - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @run main GetNanoTimeAdjustment * @author danielfuchs */ diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java index 5275b69b594..887ae768b32 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java @@ -78,7 +78,7 @@ public class ReplayCacheTestProc { mode = -1; } - uid = sun.misc.VM.geteuid(); + uid = jdk.internal.misc.VM.geteuid(); KDC kdc = KDC.create(OneKDC.REALM, HOST, 0, true); for (int i=0; i Date: Wed, 6 Jan 2016 15:13:23 +0000 Subject: [PATCH 11/37] 8146105: Undo accidential changes to sun/security/ssl/SignatureAndHashAlgorithm.java Reviewed-by: xuelei --- .../classes/sun/security/ssl/SignatureAndHashAlgorithm.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java index 1bc3a042ca6..a6e49955af3 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java @@ -417,14 +417,12 @@ final class SignatureAndHashAlgorithm { supports(HashAlgorithm.SHA1, SignatureAlgorithm.ECDSA, "SHA1withECDSA", --p); - if (Security.getProvider("SunMSCAPI") == null) { supports(HashAlgorithm.SHA224, SignatureAlgorithm.DSA, "SHA224withDSA", --p); supports(HashAlgorithm.SHA224, SignatureAlgorithm.RSA, "SHA224withRSA", --p); supports(HashAlgorithm.SHA224, SignatureAlgorithm.ECDSA, "SHA224withECDSA", --p); - } supports(HashAlgorithm.SHA256, SignatureAlgorithm.DSA, "SHA256withDSA", --p); From 41477d597a74576367fc4ac525adec30cfb2383d Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Wed, 6 Jan 2016 17:59:20 +0100 Subject: [PATCH 12/37] 8143047: Re-examine javax/management/ImplementationVersion/ImplVersionTest.java Reviewed-by: alanb, emcmanus --- .../ImplVersionCommand.java | 22 ++++++------------- .../ImplVersionTest.java | 17 +++++--------- .../mandatory/version/ImplVersionTest.java | 10 ++++----- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java b/jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java index 7f142cfae41..1a24febc056 100644 --- a/jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java +++ b/jdk/test/javax/management/ImplementationVersion/ImplVersionCommand.java @@ -53,21 +53,13 @@ public class ImplVersionCommand { // Check JMX implementation version vs. JVM implementation version // - if (Boolean.valueOf(args[1]).booleanValue()) { - if (!mbsdVersion.equals(args[0])) - throw new IllegalArgumentException( - "JMX and Java Runtime implementation versions do not match!"); - // Test OK! - // - System.out.println("JMX and Java Runtime implementation " + - "versions match!"); - } else { - // Test OK! - // - System.out.println("JMX and Java Runtime implementation " + - "versions do not match because the test " + - "is using an unbundled version of JMX!"); - } + if (!mbsdVersion.equals(args[0])) + throw new IllegalArgumentException( + "JMX and Java Runtime implementation versions do not match!"); + // Test OK! + // + System.out.println("JMX and Java Runtime implementation " + + "versions match!"); System.out.println("Bye! Bye!"); } } diff --git a/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java b/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java index b17fd6442e1..ae454b5b7e0 100644 --- a/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java +++ b/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,9 +25,9 @@ * @test * @bug 4842196 * @summary Test that there is no difference between the JMX version and the - * JDK version when JMX is bundled into the Java platform and the application - * is run with a security manager and the test codebase has the java permission - * to read the "java.runtime.version" system property. + * JDK version when the application is run with a security manager and the + * test codebase has the java permission to read the "java.runtime.version" + * system property. * @author Luis-Miguel Alventosa * @modules java.management * @run clean ImplVersionTest ImplVersionCommand @@ -36,8 +36,6 @@ */ import java.io.File; -import java.security.CodeSource; -import javax.management.MBeanServer; public class ImplVersionTest { @@ -70,18 +68,13 @@ public class ImplVersionTest { System.out.println("testClasses = " + testClasses); // Get boot class path // - boolean checkVersion = true; - String bootClassPath = System.getProperty("sun.boot.class.path"); - if (bootClassPath != null && - bootClassPath.indexOf("jmxri.jar") != -1) - checkVersion = false; String command = javaHome + File.separator + "bin" + File.separator + "java " + " -classpath " + testClasses + " -Djava.security.manager -Djava.security.policy==" + testSrc + File.separator + "policy -Dtest.classes=" + testClasses + " ImplVersionCommand " + - System.getProperty("java.runtime.version") + " " + checkVersion; + System.getProperty("java.runtime.version"); System.out.println("ImplVersionCommand Exec Command = " +command); Process proc = Runtime.getRuntime().exec(command); new ImplVersionReader(proc, proc.getInputStream()).start(); diff --git a/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java b/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java index 0a924034713..1e3662cc1ed 100644 --- a/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java +++ b/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,9 +25,9 @@ * @test * @bug 5046815 * @summary Test that RMIServer.getVersion() reflects the JDK version when - * JMX is bundled into the Java platform and the application is run with a - * security manager and the test codebase has the java permission to read - * the "java.runtime.version" system property. + * the Java platform and the application is run with a security manager and the + * test codebase has the java permission to read the "java.runtime.version" + * system property. * @author Luis-Miguel Alventosa, Joel Feraud * @modules java.management * @run clean ImplVersionTest ImplVersionCommand @@ -36,8 +36,6 @@ */ import java.io.File; -import java.security.CodeSource; -import javax.management.MBeanServer; public class ImplVersionTest { From 0c7d3be7a83387545869d6b583472b3c6864fe22 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 6 Jan 2016 17:40:48 +0000 Subject: [PATCH 13/37] 8146484: Examine sun.misc.MessageUtils Reviewed-by: alanb, mchung, sherman --- jdk/make/mapfiles/libjava/mapfile-vers | 3 +- .../build/tools/dtdbuilder/DTDParser.java | 2 - .../share/classes/java/lang/StringCoding.java | 28 ++-- .../share/classes/sun/misc/MessageUtils.java | 127 ------------------ .../{MessageUtils.c => StringCoding.c} | 15 +-- .../javax/swing/text/html/parser/Parser.java | 2 - .../share/classes/sun/applet/AppletPanel.java | 3 - 7 files changed, 21 insertions(+), 159 deletions(-) delete mode 100644 jdk/src/java.base/share/classes/sun/misc/MessageUtils.java rename jdk/src/java.base/share/native/libjava/{MessageUtils.c => StringCoding.c} (86%) diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index ac1be88ebe6..3ec9f530b2d 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -216,6 +216,7 @@ SUNWprivate_1.1 { Java_java_lang_SecurityManager_getClassContext; Java_java_lang_Shutdown_halt0; Java_java_lang_String_intern; + Java_java_lang_StringCoding_err; Java_java_lang_StringUTF16_isBigEndian; Java_java_lang_System_identityHashCode; Java_java_lang_System_initProperties; @@ -243,8 +244,6 @@ SUNWprivate_1.1 { Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemGMTOffsetID; Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; - Java_sun_misc_MessageUtils_toStderr; - Java_sun_misc_MessageUtils_toStdout; Java_sun_misc_NativeSignalHandler_handle0; Java_sun_misc_Signal_findSignal; Java_sun_misc_Signal_handle0; diff --git a/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java b/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java index 753007a08ec..0dee68e367f 100644 --- a/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java +++ b/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java @@ -35,8 +35,6 @@ import java.util.Hashtable; import java.util.BitSet; import java.text.MessageFormat; -import sun.misc.MessageUtils; - /** * A parser for DTDs. This parser roughly corresponds to the * rules specified in "The SGML Handbook" by Charles F. Goldfarb. diff --git a/jdk/src/java.base/share/classes/java/lang/StringCoding.java b/jdk/src/java.base/share/classes/java/lang/StringCoding.java index b1e25d5128f..fe875372218 100644 --- a/jdk/src/java.base/share/classes/java/lang/StringCoding.java +++ b/jdk/src/java.base/share/classes/java/lang/StringCoding.java @@ -39,7 +39,6 @@ import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.UnsupportedCharsetException; import java.util.Arrays; import jdk.internal.HotSpotIntrinsicCandidate; -import sun.misc.MessageUtils; import sun.nio.cs.HistoricallyNamedCharset; import sun.nio.cs.ArrayDecoder; import sun.nio.cs.ArrayEncoder; @@ -106,11 +105,11 @@ class StringCoding { private static void warnUnsupportedCharset(String csn) { if (warnUnsupportedCharset) { - // Use sun.misc.MessageUtils rather than the Logging API or - // System.err since this method may be called during VM - // initialization before either is available. - MessageUtils.err("WARNING: Default charset " + csn + - " not supported, using ISO-8859-1 instead"); + // Use err(String) rather than the Logging API or System.err + // since this method may be called during VM initialization + // before either is available. + err("WARNING: Default charset " + csn + + " not supported, using ISO-8859-1 instead\n"); warnUnsupportedCharset = false; } } @@ -341,10 +340,9 @@ class StringCoding { try { return decode("ISO-8859-1", ba, off, len); } catch (UnsupportedEncodingException x) { - // If this code is hit during VM initialization, MessageUtils is + // If this code is hit during VM initialization, err(String) is // the only way we will be able to get any kind of error message. - MessageUtils.err("ISO-8859-1 charset not available: " - + x.toString()); + err("ISO-8859-1 charset not available: " + x.toString() + "\n"); // If we can not find ISO-8859-1 (a required encoding) then things // are seriously wrong with the installation. System.exit(1); @@ -653,14 +651,20 @@ class StringCoding { try { return encode("ISO-8859-1", coder, val); } catch (UnsupportedEncodingException x) { - // If this code is hit during VM initialization, MessageUtils is + // If this code is hit during VM initialization, err(String) is // the only way we will be able to get any kind of error message. - MessageUtils.err("ISO-8859-1 charset not available: " - + x.toString()); + err("ISO-8859-1 charset not available: " + x.toString() + "\n"); // If we can not find ISO-8859-1 (a required encoding) then things // are seriously wrong with the installation. System.exit(1); return null; } } + + /** + * Print a message directly to stderr, bypassing all character conversion + * methods. + * @param msg message to print + */ + private static native void err(String msg); } diff --git a/jdk/src/java.base/share/classes/sun/misc/MessageUtils.java b/jdk/src/java.base/share/classes/sun/misc/MessageUtils.java deleted file mode 100644 index 75d5ee424dd..00000000000 --- a/jdk/src/java.base/share/classes/sun/misc/MessageUtils.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved. - * 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 sun.misc; - -/** - * MessageUtils: miscellaneous utilities for handling error and status - * properties and messages. - * - * @author Herb Jellinek - */ - -public class MessageUtils { - // can instantiate it for to allow less verbose use - via instance - // instead of classname - - public MessageUtils() { } - - public static String subst(String patt, String arg) { - String args[] = { arg }; - return subst(patt, args); - } - - public static String subst(String patt, String arg1, String arg2) { - String args[] = { arg1, arg2 }; - return subst(patt, args); - } - - public static String subst(String patt, String arg1, String arg2, - String arg3) { - String args[] = { arg1, arg2, arg3 }; - return subst(patt, args); - } - - public static String subst(String patt, String args[]) { - StringBuilder result = new StringBuilder(); - int len = patt.length(); - for (int i = 0; i >= 0 && i < len; i++) { - char ch = patt.charAt(i); - if (ch == '%') { - if (i != len) { - int index = Character.digit(patt.charAt(i + 1), 10); - if (index == -1) { - result.append(patt.charAt(i + 1)); - i++; - } else if (index < args.length) { - result.append(args[index]); - i++; - } - } - } else { - result.append(ch); - } - } - return result.toString(); - } - - public static String substProp(String propName, String arg) { - return subst(System.getProperty(propName), arg); - } - - public static String substProp(String propName, String arg1, String arg2) { - return subst(System.getProperty(propName), arg1, arg2); - } - - public static String substProp(String propName, String arg1, String arg2, - String arg3) { - return subst(System.getProperty(propName), arg1, arg2, arg3); - } - - /** - * Print a message directly to stderr, bypassing all the - * character conversion methods. - * @param msg message to print - */ - public static native void toStderr(String msg); - - /** - * Print a message directly to stdout, bypassing all the - * character conversion methods. - * @param msg message to print - */ - public static native void toStdout(String msg); - - - // Short forms of the above - - public static void err(String s) { - toStderr(s + "\n"); - } - - public static void out(String s) { - toStdout(s + "\n"); - } - - // Print a stack trace to stderr - // - public static void where() { - Throwable t = new Throwable(); - StackTraceElement[] es = t.getStackTrace(); - for (int i = 1; i < es.length; i++) - toStderr("\t" + es[i].toString() + "\n"); - } - -} diff --git a/jdk/src/java.base/share/native/libjava/MessageUtils.c b/jdk/src/java.base/share/native/libjava/StringCoding.c similarity index 86% rename from jdk/src/java.base/share/native/libjava/MessageUtils.c rename to jdk/src/java.base/share/native/libjava/StringCoding.c index 49315dc894d..9ca51cd7425 100644 --- a/jdk/src/java.base/share/native/libjava/MessageUtils.c +++ b/jdk/src/java.base/share/native/libjava/StringCoding.c @@ -26,11 +26,10 @@ #include #include #include -#include #include #include -#include "sun_misc_MessageUtils.h" +#include "java_lang_StringCoding.h" static void printToFile(JNIEnv *env, jstring s, FILE *file) @@ -41,8 +40,8 @@ printToFile(JNIEnv *env, jstring s, FILE *file) const jchar *sAsArray; if (s == NULL) { - s = (*env)->NewStringUTF(env, "null"); - if (s == NULL) return; + JNU_ThrowNullPointerException(env, NULL); + return; } sAsArray = (*env)->GetStringChars(env, s, NULL); @@ -70,13 +69,7 @@ printToFile(JNIEnv *env, jstring s, FILE *file) } JNIEXPORT void JNICALL -Java_sun_misc_MessageUtils_toStderr(JNIEnv *env, jclass cls, jstring s) +Java_java_lang_StringCoding_err(JNIEnv *env, jclass cls, jstring s) { printToFile(env, s, stderr); } - -JNIEXPORT void JNICALL -Java_sun_misc_MessageUtils_toStdout(JNIEnv *env, jclass cls, jstring s) -{ - printToFile(env, s, stdout); -} diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java index 5379d632230..d178ae4516c 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java @@ -35,8 +35,6 @@ import java.util.Vector; import java.util.Enumeration; import java.net.URL; -import sun.misc.MessageUtils; - /** * A simple DTD-driven HTML parser. The parser reads an * HTML file from an InputStream and calls various methods diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java index a9bacd5c3f2..2283e2fe8ec 100644 --- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java +++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java @@ -44,7 +44,6 @@ import sun.awt.AppContext; import sun.awt.EmbeddedFrame; import sun.awt.SunToolkit; import sun.misc.ManagedLocalsThread; -import sun.misc.MessageUtils; import sun.misc.PerformanceLogger; import sun.security.util.SecurityConstants; @@ -118,8 +117,6 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable { */ Dimension currentAppletSize = new Dimension(10, 10); - MessageUtils mu = new MessageUtils(); - /** * The thread to use during applet loading */ From ae68be4a75ae9a0a9129845c9a14112e11418c45 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Wed, 6 Jan 2016 10:15:37 -0800 Subject: [PATCH 14/37] 8146041: java.net.URLConnection.guessContentTypeFromStream() does not recognize TIFF streams Add detection of TIFF magic numbers. Reviewed-by: rriggs, chegar --- .../share/classes/java/net/URLConnection.java | 7 +- .../net/URLConnection/TIFFContentGuesser.java | 66 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 jdk/test/java/net/URLConnection/TIFFContentGuesser.java diff --git a/jdk/src/java.base/share/classes/java/net/URLConnection.java b/jdk/src/java.base/share/classes/java/net/URLConnection.java index 0fe18279b1b..87f4378b2ad 100644 --- a/jdk/src/java.base/share/classes/java/net/URLConnection.java +++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1567,6 +1567,11 @@ public abstract class URLConnection { } } + if ((c1 == 0x49 && c2 == 0x49 && c3 == 0x2a && c4 == 0x00) + || (c1 == 0x4d && c2 == 0x4d && c3 == 0x00 && c4 == 0x2a)) { + return "image/tiff"; + } + if (c1 == 0xD0 && c2 == 0xCF && c3 == 0x11 && c4 == 0xE0 && c5 == 0xA1 && c6 == 0xB1 && c7 == 0x1A && c8 == 0xE1) { diff --git a/jdk/test/java/net/URLConnection/TIFFContentGuesser.java b/jdk/test/java/net/URLConnection/TIFFContentGuesser.java new file mode 100644 index 00000000000..c996b7a7a63 --- /dev/null +++ b/jdk/test/java/net/URLConnection/TIFFContentGuesser.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 8146041 + * @summary java.net.URLConnection.guessContentTypeFromStream() does not + * recognize TIFF streams + */ + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.net.URLConnection; + +public class TIFFContentGuesser { + private static final byte[] LITTLE_ENDIAN_MAGIC = + new byte[] {(byte)0x49, (byte)0x49, (byte)0x2a, (byte)0}; + private static final byte[] BIG_ENDIAN_MAGIC = + new byte[] {(byte)0x4d, (byte)0x4d, (byte)0, (byte)0x2a}; + + private static final String TIFF_MIME_TYPE = "image/tiff"; + + public static void main(String[] args) throws Throwable { + int failures = 0; + + InputStream stream = new ByteArrayInputStream(LITTLE_ENDIAN_MAGIC); + String contentType = URLConnection.guessContentTypeFromStream(stream); + if (contentType == null || !contentType.equals(TIFF_MIME_TYPE)) { + failures++; + System.err.println("Test failed for little endian magic"); + } + + stream = new ByteArrayInputStream(BIG_ENDIAN_MAGIC); + contentType = URLConnection.guessContentTypeFromStream(stream); + if (contentType == null || !contentType.equals(TIFF_MIME_TYPE)) { + failures++; + System.err.println("Test failed for big endian magic"); + } + + if (failures != 0) { + throw new RuntimeException + ("Test failed with " + failures + " error(s)"); + } + } +} + From 01b7a382918082b4e53518326fcadb98e1cfb505 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Wed, 6 Jan 2016 20:16:59 +0100 Subject: [PATCH 15/37] 8146526: Improve java.net.URI$Parser startup characteristics Reviewed-by: chegar, alanb --- .../java.base/share/classes/java/net/URI.java | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) 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 e896568c7a1..9bf575bfdc6 100644 --- a/jdk/src/java.base/share/classes/java/net/URI.java +++ b/jdk/src/java.base/share/classes/java/net/URI.java @@ -2059,7 +2059,7 @@ public final class URI // 5.2 (2): Reference to current document (lone fragment) if ((child.scheme == null) && (child.authority == null) - && child.path.equals("") && (child.fragment != null) + && child.path.isEmpty() && (child.fragment != null) && (child.query == null)) { if ((base.fragment != null) && child.fragment.equals(base.fragment)) { @@ -2647,13 +2647,6 @@ public final class URI private static final long L_SCHEME = L_ALPHA | L_DIGIT | lowMask("+-."); private static final long H_SCHEME = H_ALPHA | H_DIGIT | highMask("+-."); - // uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" | - // "&" | "=" | "+" | "$" | "," - private static final long L_URIC_NO_SLASH - = L_UNRESERVED | L_ESCAPED | lowMask(";?:@&=+$,"); - private static final long H_URIC_NO_SLASH - = H_UNRESERVED | H_ESCAPED | highMask(";?:@&=+$,"); - // scope_id = alpha | digit | "_" | "." private static final long L_SCOPE_ID = L_ALPHANUM | lowMask("_."); @@ -2884,23 +2877,10 @@ public final class URI // -- Simple access to the input string -- - // Return a substring of the input string - // - private String substring(int start, int end) { - return input.substring(start, end); - } - - // Return the char at position p, - // assuming that p < input.length() - // - private char charAt(int p) { - return input.charAt(p); - } - // Tells whether start < end and, if so, whether charAt(start) == c // private boolean at(int start, int end, char c) { - return (start < end) && (charAt(start) == c); + return (start < end) && (input.charAt(start) == c); } // Tells whether start + s.length() < end and, if so, @@ -2913,7 +2893,7 @@ public final class URI return false; int i = 0; while (i < sn) { - if (charAt(p++) != s.charAt(i)) { + if (input.charAt(p++) != s.charAt(i)) { break; } i++; @@ -2953,7 +2933,7 @@ public final class URI // start position. // private int scan(int start, int end, char c) { - if ((start < end) && (charAt(start) == c)) + if ((start < end) && (input.charAt(start) == c)) return start + 1; return start; } @@ -2968,7 +2948,7 @@ public final class URI private int scan(int start, int end, String err, String stop) { int p = start; while (p < end) { - char c = charAt(p); + char c = input.charAt(p); if (err.indexOf(c) >= 0) return -1; if (stop.indexOf(c) >= 0) @@ -2978,6 +2958,23 @@ public final class URI return p; } + // Scan forward from the given start position. Stop at the first char + // in the stop string (in which case the index of the preceding char is + // returned), or the end of the input string (in which case the length + // of the input string is returned). May return the start position if + // nothing matches. + // + private int scan(int start, int end, String stop) { + int p = start; + while (p < end) { + char c = input.charAt(p); + if (stop.indexOf(c) >= 0) + break; + p++; + } + return p; + } + // Scan a potential escape sequence, starting at the given position, // with the given first char (i.e., charAt(start) == c). // @@ -2992,8 +2989,8 @@ public final class URI if (c == '%') { // Process escape pair if ((p + 3 <= n) - && match(charAt(p + 1), L_HEX, H_HEX) - && match(charAt(p + 2), L_HEX, H_HEX)) { + && match(input.charAt(p + 1), L_HEX, H_HEX) + && match(input.charAt(p + 2), L_HEX, H_HEX)) { return p + 3; } fail("Malformed escape pair", p); @@ -3013,7 +3010,7 @@ public final class URI { int p = start; while (p < n) { - char c = charAt(p); + char c = input.charAt(p); if (match(c, lowMask, highMask)) { p++; continue; @@ -3067,13 +3064,13 @@ public final class URI failExpecting("scheme name", 0); checkChar(0, L_ALPHA, H_ALPHA, "scheme name"); checkChars(1, p, L_SCHEME, H_SCHEME, "scheme name"); - scheme = substring(0, p); + scheme = input.substring(0, p); p++; // Skip ':' ssp = p; if (at(p, n, '/')) { p = parseHierarchical(p, n); } else { - int q = scan(p, n, "", "#"); + int q = scan(p, n, "#"); if (q <= p) failExpecting("scheme-specific part", p); checkChars(p, q, L_URIC, H_URIC, "opaque part"); @@ -3083,10 +3080,10 @@ public final class URI ssp = 0; p = parseHierarchical(0, n); } - schemeSpecificPart = substring(ssp, p); + schemeSpecificPart = input.substring(ssp, p); if (at(p, n, '#')) { checkChars(p + 1, n, L_URIC, H_URIC, "fragment"); - fragment = substring(p + 1, n); + fragment = input.substring(p + 1, n); p = n; } if (p < n) @@ -3113,7 +3110,7 @@ public final class URI int p = start; if (at(p, n, '/') && at(p + 1, n, '/')) { p += 2; - int q = scan(p, n, "", "/?#"); + int q = scan(p, n, "/?#"); if (q > p) { p = parseAuthority(p, q); } else if (q < n) { @@ -3122,15 +3119,15 @@ public final class URI } else failExpecting("authority", p); } - int q = scan(p, n, "", "?#"); // DEVIATION: May be empty + int q = scan(p, n, "?#"); // DEVIATION: May be empty checkChars(p, q, L_PATH, H_PATH, "path"); - path = substring(p, q); + path = input.substring(p, q); p = q; if (at(p, n, '?')) { p++; - q = scan(p, n, "", "#"); + q = scan(p, n, "#"); checkChars(p, q, L_URIC, H_URIC, "query"); - query = substring(p, q); + query = input.substring(p, q); p = q; } return p; @@ -3154,7 +3151,7 @@ public final class URI boolean serverChars; boolean regChars; - if (scan(p, n, "", "]") > p) { + if (scan(p, n, "]") > p) { // contains a literal IPv6 address, therefore % is allowed serverChars = (scan(p, n, L_SERVER_PERCENT, H_SERVER_PERCENT) == n); } else { @@ -3164,7 +3161,7 @@ public final class URI if (regChars && !serverChars) { // Must be a registry-based authority - authority = substring(p, n); + authority = input.substring(p, n); return n; } @@ -3176,7 +3173,7 @@ public final class URI q = parseServer(p, n); if (q < n) failExpecting("end of authority", q); - authority = substring(p, n); + authority = input.substring(p, n); } catch (URISyntaxException x) { // Undo results of failed parse userInfo = null; @@ -3198,7 +3195,7 @@ public final class URI if (q < n) { if (regChars) { // Registry-based authority - authority = substring(p, n); + authority = input.substring(p, n); } else if (ex != null) { // Re-throw exception; it was probably due to // a malformed IPv6 address @@ -3224,7 +3221,7 @@ public final class URI q = scan(p, n, "/?#", "@"); if ((q >= p) && at(q, n, '@')) { checkChars(p, q, L_USERINFO, H_USERINFO, "user info"); - userInfo = substring(p, q); + userInfo = input.substring(p, q); p = q + 1; // Skip '@' } @@ -3235,7 +3232,7 @@ public final class URI q = scan(p, n, "/?#", "]"); if ((q > p) && at(q, n, ']')) { // look for a "%" scope id - int r = scan (p, q, "", "%"); + int r = scan (p, q, "%"); if (r > p) { parseIPv6Reference(p, r); if (r+1 == q) { @@ -3246,7 +3243,7 @@ public final class URI } else { parseIPv6Reference(p, q); } - host = substring(p-1, q+1); + host = input.substring(p-1, q+1); p = q + 1; } else { failExpecting("closing bracket for IPv6 address", q); @@ -3261,7 +3258,7 @@ public final class URI // port if (at(p, n, ':')) { p++; - q = scan(p, n, "", "/"); + q = scan(p, n, "/"); if (q > p) { checkChars(p, q, L_DIGIT, H_DIGIT, "port number"); try { @@ -3361,13 +3358,13 @@ public final class URI // IPv4 address is followed by something - check that // it's a ":" as this is the only valid character to // follow an address. - if (charAt(p) != ':') { + if (input.charAt(p) != ':') { p = -1; } } if (p > start) - host = substring(start, p); + host = input.substring(start, p); return p; } @@ -3393,7 +3390,7 @@ public final class URI p = q; q = scan(p, n, L_ALPHANUM | L_DASH, H_ALPHANUM | H_DASH); if (q > p) { - if (charAt(q - 1) == '-') + if (input.charAt(q - 1) == '-') fail("Illegal character in hostname", q - 1); p = q; } @@ -3412,11 +3409,11 @@ public final class URI // for a fully qualified hostname check that the rightmost // label starts with an alpha character. - if (l > start && !match(charAt(l), L_ALPHA, H_ALPHA)) { + if (l > start && !match(input.charAt(l), L_ALPHA, H_ALPHA)) { fail("Illegal character in hostname", l); } - host = substring(start, p); + host = input.substring(start, p); return p; } From 02b6ec06122cd492c034ace8c9cbfd530f1e96b3 Mon Sep 17 00:00:00 2001 From: Felix Yang Date: Wed, 6 Jan 2016 22:22:01 -0800 Subject: [PATCH 16/37] 8140472: java/net/ipv6tests/TcpTest.java failed intermittently with java.net.BindException: Address already in use: NET_Bind Reviewed-by: chegar --- jdk/test/java/net/ipv6tests/TcpTest.java | 51 ++++-------------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/jdk/test/java/net/ipv6tests/TcpTest.java b/jdk/test/java/net/ipv6tests/TcpTest.java index 5f72553da82..63008acddba 100644 --- a/jdk/test/java/net/ipv6tests/TcpTest.java +++ b/jdk/test/java/net/ipv6tests/TcpTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,8 +60,7 @@ public class TcpTest extends Tests { dprintln ("Local Addresses"); dprintln (ia4addr.toString()); dprintln (ia6addr.toString()); - test1 (0); - test1 (5100); + test1(); test2(); test3(); test4(); @@ -69,11 +68,9 @@ public class TcpTest extends Tests { /* basic TCP connectivity test using IPv6 only and IPv4/IPv6 together */ - static void test1 (int port) throws Exception { - server = new ServerSocket (port); - if (port == 0) { - port = server.getLocalPort(); - } + static void test1 () throws Exception { + server = new ServerSocket (0); + int port = server.getLocalPort(); // try Ipv6 only c1 = new Socket ("::1", port); s1 = server.accept (); @@ -107,9 +104,7 @@ public class TcpTest extends Tests { /** bind tests: * 1. bind to specific address IPv4 only (any port) * 2. bind to specific address IPv6 only (any port) - * 3. bind to specific address IPv4 only (specific port) - * 4. bind to specific address IPv4 only (specific port) - * 5. bind to any address IPv4 (test collision) + * 3. bind to any address IPv4 (test collision) */ static void test2 () throws Exception { @@ -147,39 +142,6 @@ public class TcpTest extends Tests { server.close (); c1.close (); - /* now try IPv6 specific port only */ - - server = new ServerSocket (); - sadr = new InetSocketAddress (ia6addr, 5200); - server.bind (sadr); - port = server.getLocalPort(); - t_assert (port == 5200); - - c1 = new Socket (ia6addr, port); - try { - c2 = new Socket (ia4addr, port); - throw new RuntimeException ("connect to IPv4 address should be refused"); - } catch (IOException e) { } - server.close (); - c1.close (); - - /* now try IPv4 specific port only */ - - server = new ServerSocket (); - sadr = new InetSocketAddress (ia4addr, 5200); - server.bind (sadr); - port = server.getLocalPort(); - t_assert (port == 5200); - - c1 = new Socket (ia4addr, port); - - try { - c2 = new Socket (ia6addr, port); - throw new RuntimeException ("connect to IPv6 address should be refused"); - } catch (IOException e) { } - server.accept().close(); - c1.close (); - server.close(); System.out.println ("Test2: OK"); } @@ -242,3 +204,4 @@ public class TcpTest extends Tests { System.out.println ("Test4: OK"); } } + From f8375017970a9eec9c09bdfb98bbcbb2d4d32fd9 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Thu, 7 Jan 2016 10:54:41 +0100 Subject: [PATCH 17/37] 8146482: [TESTBUG] java/net/SocketOption/OptionTest should only use multicast capable interfaces for multicast tests Reviewed-by: chegar --- jdk/test/java/net/SocketOption/OptionsTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jdk/test/java/net/SocketOption/OptionsTest.java b/jdk/test/java/net/SocketOption/OptionsTest.java index 5493c2cae6e..947d784aa9d 100644 --- a/jdk/test/java/net/SocketOption/OptionsTest.java +++ b/jdk/test/java/net/SocketOption/OptionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -80,8 +80,11 @@ public class OptionsTest { static NetworkInterface getNetworkInterface() { try { Enumeration nifs = NetworkInterface.getNetworkInterfaces(); - if (nifs.hasMoreElements()) { - return (NetworkInterface)nifs.nextElement(); + while (nifs.hasMoreElements()) { + NetworkInterface ni = (NetworkInterface)nifs.nextElement(); + if (ni.supportsMulticast()) { + return ni; + } } } catch (Exception e) { } From 719833448ac22d0cda9f2aeff2475d748106f20c Mon Sep 17 00:00:00 2001 From: Vyom Tewari Date: Fri, 18 Dec 2015 16:06:26 +0530 Subject: [PATCH 18/37] 4823133: RandomAccessFile.length() is not thread-safe RandomAccessFile.length() is not thread-safe Reviewed-by: rriggs, dfuchs, martin, dsamersoff --- .../share/native/libjava/RandomAccessFile.c | 16 +- .../unix/native/libjava/io_util_md.c | 14 +- .../unix/native/libjava/io_util_md.h | 5 +- .../windows/native/libjava/io_util_md.c | 13 +- .../windows/native/libjava/io_util_md.h | 4 +- .../io/RandomAccessFile/FileLengthTest.java | 137 ++++++++++++++++++ 6 files changed, 173 insertions(+), 16 deletions(-) create mode 100644 jdk/test/java/io/RandomAccessFile/FileLengthTest.java diff --git a/jdk/src/java.base/share/native/libjava/RandomAccessFile.c b/jdk/src/java.base/share/native/libjava/RandomAccessFile.c index a44d8f39681..4c02741f415 100644 --- a/jdk/src/java.base/share/native/libjava/RandomAccessFile.c +++ b/jdk/src/java.base/share/native/libjava/RandomAccessFile.c @@ -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 @@ -103,23 +103,19 @@ Java_java_io_RandomAccessFile_getFilePointer(JNIEnv *env, jobject this) { JNIEXPORT jlong JNICALL Java_java_io_RandomAccessFile_length(JNIEnv *env, jobject this) { + FD fd; - jlong cur = jlong_zero; - jlong end = jlong_zero; + jlong length = jlong_zero; fd = GET_FD(this, raf_fd); if (fd == -1) { JNU_ThrowIOException(env, "Stream Closed"); return -1; } - if ((cur = IO_Lseek(fd, 0L, SEEK_CUR)) == -1) { - JNU_ThrowIOExceptionWithLastError(env, "Seek failed"); - } else if ((end = IO_Lseek(fd, 0L, SEEK_END)) == -1) { - JNU_ThrowIOExceptionWithLastError(env, "Seek failed"); - } else if (IO_Lseek(fd, cur, SEEK_SET) == -1) { - JNU_ThrowIOExceptionWithLastError(env, "Seek failed"); + if ((length = IO_GetLength(fd)) == -1) { + JNU_ThrowIOExceptionWithLastError(env, "GetLength failed"); } - return end; + return length; } JNIEXPORT void JNICALL diff --git a/jdk/src/java.base/unix/native/libjava/io_util_md.c b/jdk/src/java.base/unix/native/libjava/io_util_md.c index ff7b9b83d46..0b2141b8356 100644 --- a/jdk/src/java.base/unix/native/libjava/io_util_md.c +++ b/jdk/src/java.base/unix/native/libjava/io_util_md.c @@ -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 @@ -22,7 +22,6 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - #include "jni.h" #include "jni_util.h" #include "jvm.h" @@ -219,3 +218,14 @@ handleSetLength(FD fd, jlong length) RESTARTABLE(ftruncate64(fd, length), result); return result; } + +jlong +handleGetLength(FD fd) +{ + struct stat64 sb; + if (fstat64(fd, &sb) == 0) { + return sb.st_size; + } else { + return -1; + } +} diff --git a/jdk/src/java.base/unix/native/libjava/io_util_md.h b/jdk/src/java.base/unix/native/libjava/io_util_md.h index b7b2573a02e..f99b4a3c009 100644 --- a/jdk/src/java.base/unix/native/libjava/io_util_md.h +++ b/jdk/src/java.base/unix/native/libjava/io_util_md.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, 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 @@ -39,7 +39,7 @@ ssize_t handleWrite(FD fd, const void *buf, jint len); ssize_t handleRead(FD fd, void *buf, jint len); jint handleAvailable(FD fd, jlong *pbytes); jint handleSetLength(FD fd, jlong length); - +jlong handleGetLength(FD fd); FD handleOpen(const char *path, int oflag, int mode); /* @@ -72,6 +72,7 @@ FD handleOpen(const char *path, int oflag, int mode); #define IO_Append handleWrite #define IO_Available handleAvailable #define IO_SetLength handleSetLength +#define IO_GetLength handleGetLength #ifdef _ALLBSD_SOURCE #define open64 open diff --git a/jdk/src/java.base/windows/native/libjava/io_util_md.c b/jdk/src/java.base/windows/native/libjava/io_util_md.c index a37ecb6e28b..b7626487a71 100644 --- a/jdk/src/java.base/windows/native/libjava/io_util_md.c +++ b/jdk/src/java.base/windows/native/libjava/io_util_md.c @@ -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 @@ -584,3 +584,14 @@ handleLseek(FD fd, jlong offset, jint whence) } return long_to_jlong(pos.QuadPart); } + +jlong +handleGetLength(FD fd) { + HANDLE h = (HANDLE) fd; + LARGE_INTEGER length; + if (GetFileSizeEx(h, &length) != 0) { + return long_to_jlong(length.QuadPart); + } else { + return -1; + } +} diff --git a/jdk/src/java.base/windows/native/libjava/io_util_md.h b/jdk/src/java.base/windows/native/libjava/io_util_md.h index d85cdd3dead..59b2252ed09 100644 --- a/jdk/src/java.base/windows/native/libjava/io_util_md.h +++ b/jdk/src/java.base/windows/native/libjava/io_util_md.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, 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 @@ -44,6 +44,7 @@ int currentDirLength(const WCHAR* path, int pathlen); int handleAvailable(FD fd, jlong *pbytes); int handleSync(FD fd); int handleSetLength(FD fd, jlong length); +jlong handleGetLength(FD fd); JNIEXPORT jint handleRead(FD fd, void *buf, jint len); jint handleWrite(FD fd, const void *buf, jint len); jint handleAppend(FD fd, const void *buf, jint len); @@ -84,6 +85,7 @@ FD winFileHandleOpen(JNIEnv *env, jstring path, int flags); #define IO_Lseek handleLseek #define IO_Available handleAvailable #define IO_SetLength handleSetLength +#define IO_GetLength handleGetLength /* * Setting the handle field in Java_java_io_FileDescriptor_set for diff --git a/jdk/test/java/io/RandomAccessFile/FileLengthTest.java b/jdk/test/java/io/RandomAccessFile/FileLengthTest.java new file mode 100644 index 00000000000..3f5bff1a46e --- /dev/null +++ b/jdk/test/java/io/RandomAccessFile/FileLengthTest.java @@ -0,0 +1,137 @@ +/* + * 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 randomAccessFile 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 4823133 + * @summary optimize RandomAccessFile.length() and length() is thread safe now. + */ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.RandomAccessFile; + +/** + * + * @author vyom.tewari@oracle.com + */ +public class FileLengthTest { + + private static final int BUF_SIZE = 4096; + private static RandomAccessFile randomAccessFile; + private static Thread fileLengthCaller; + private static Thread fileContentReader; + private static StringBuilder fileContents; + private static volatile boolean isFailed = false; + + /** + * this thread will call length() in loop + */ + private static void startLengthThread() { + if (randomAccessFile == null) { + return; + } + fileLengthCaller = new Thread(() -> { + while (true) { + try { + long length = randomAccessFile.length(); + if (length < 0) { + return; + } + } catch (IOException ex) { + return; + } + } + }); + fileLengthCaller.setName("RandomAccessFile-length-caller"); + fileLengthCaller.setDaemon(true); + fileLengthCaller.start(); + } + + /** + * this thread will call read() and store the content in internal buffer. + */ + private static void startReaderThread() { + if (randomAccessFile == null) { + return; + } + fileContentReader = new Thread(() -> { + StringBuilder sb = new StringBuilder(BUF_SIZE); + int i; + byte arr[] = new byte[8]; + try { + while ((i = randomAccessFile.read(arr)) != -1) { + sb.append(new String(arr, 0, i)); + } + if (!sb.toString().equals(fileContents.toString())) { + isFailed = true; + } + } catch (IOException ex) { + } + }); + fileContentReader.setName("RandomAccessFile-content-reader"); + fileContentReader.setDaemon(true); + fileContentReader.start(); + } + + public static void main(String args[]) { + byte arr[] = new byte[BUF_SIZE]; + String testFile = "testfile.txt"; + try { + createDummyFile(testFile); + File file = new File(testFile); + file.deleteOnExit(); + randomAccessFile = new RandomAccessFile(file, "r"); + int count = randomAccessFile.read(arr); + randomAccessFile.seek(0); + fileContents = new StringBuilder(BUF_SIZE); + fileContents.append(new String(arr, 0, count)); + startLengthThread(); + startReaderThread(); + fileContentReader.join(); + } catch (FileNotFoundException | InterruptedException ex) { + } catch (IOException ex) { + } finally { + try { + randomAccessFile.close(); + } catch (IOException ex) { + } + } + if (isFailed) { + throw new RuntimeException("RandomAccessFile.length() changed the underlying file pointer."); + } + } + + private static void createDummyFile(String fileName) throws FileNotFoundException, IOException { + try (FileOutputStream outputStream = new FileOutputStream(new File(fileName))) { + String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + int count = 0; + while ((count + str.length()) < BUF_SIZE) { + outputStream.write(str.getBytes()); + count += str.length(); + } + outputStream.flush(); + } + } +} From 1c39decc2c7e55f2abfd85330ce8bada074fa7f1 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Tue, 5 Jan 2016 18:40:43 +0530 Subject: [PATCH 19/37] 8146240: Three nashorn files contain "GNU General Public License" header Reviewed-by: jlaskey --- nashorn/test/script/basic/JDK-8134488.js | 2 +- nashorn/test/script/basic/JDK-8134490.js | 2 +- nashorn/test/script/basic/JDK-8134939.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nashorn/test/script/basic/JDK-8134488.js b/nashorn/test/script/basic/JDK-8134488.js index 928961a2e7c..68b3ebb6bff 100644 --- a/nashorn/test/script/basic/JDK-8134488.js +++ b/nashorn/test/script/basic/JDK-8134488.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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 diff --git a/nashorn/test/script/basic/JDK-8134490.js b/nashorn/test/script/basic/JDK-8134490.js index d7c10fdcc17..2a2a0129fab 100644 --- a/nashorn/test/script/basic/JDK-8134490.js +++ b/nashorn/test/script/basic/JDK-8134490.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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 diff --git a/nashorn/test/script/basic/JDK-8134939.js b/nashorn/test/script/basic/JDK-8134939.js index 4f22ef0a075..0aa1b82fa07 100644 --- a/nashorn/test/script/basic/JDK-8134939.js +++ b/nashorn/test/script/basic/JDK-8134939.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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 From 78fe8855fecd0251629a75806f679266a2953e01 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 6 Jan 2016 10:01:14 +0000 Subject: [PATCH 20/37] 8145544: Move sun.misc.VM to jdk.internal.misc Reviewed-by: alanb, mullan, weijun --- modules.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules.xml b/modules.xml index 825f4acfa1c..517842f69d9 100644 --- a/modules.xml +++ b/modules.xml @@ -233,9 +233,11 @@ java.logging java.management java.naming + java.rmi java.security.jgss java.sql java.xml + jdk.charsets jdk.management.resource jdk.scripting.nashorn From 2d19a4c55027ef0d294da6376bc0671d2d89be76 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 6 Jan 2016 10:03:03 +0000 Subject: [PATCH 21/37] 8145544: Move sun.misc.VM to jdk.internal.misc Reviewed-by: alanb, dholmes, mullan, weijun --- hotspot/src/share/vm/prims/jvm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp index 463b42180d2..b416aa7c65c 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp @@ -285,7 +285,7 @@ JVM_LEAF(jlong, JVM_NanoTime(JNIEnv *env, jclass ignored)) return os::javaTimeNanos(); JVM_END -// The function below is actually exposed by sun.misc.VM and not +// The function below is actually exposed by jdk.internal.misc.VM and not // java.lang.System, but we choose to keep it here so that it stays next // to JVM_CurrentTimeMillis and JVM_NanoTime From 3b28163296792dde7b618b93f62c902d0ac857ed Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Wed, 6 Jan 2016 20:19:02 +0530 Subject: [PATCH 22/37] 8146556: jdk.dynalink.beans.ClassLinker can avoid using specific lookup and can use publicLookup instead Reviewed-by: jlaskey --- .../share/classes/jdk/dynalink/beans/ClassLinker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java index fdb3e1cbc5f..47db85f79f5 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java @@ -102,7 +102,7 @@ class ClassLinker extends BeanLinker { setPropertyGetter("static", FOR_CLASS, ValidationType.EXACT_CLASS); } - private static final MethodHandle FOR_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClass.class, + private static final MethodHandle FOR_CLASS = Lookup.PUBLIC.findStatic(StaticClass.class, "forClass", MethodType.methodType(StaticClass.class, Class.class)); } From 92ce70dc0325e5ef70fb62e825dd897c873893af Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Thu, 7 Jan 2016 10:10:06 -0500 Subject: [PATCH 23/37] 8146574: (process) ProcessHandle test cleanup Reviewed-by: chegar --- jdk/test/java/lang/ProcessHandle/Basic.java | 4 +++- jdk/test/java/lang/ProcessHandle/InfoTest.java | 15 +++++++-------- jdk/test/java/lang/ProcessHandle/OnExitTest.java | 7 ++++--- .../java/lang/ProcessHandle/PermissionTest.java | 7 ++++++- jdk/test/java/lang/ProcessHandle/ProcessUtil.java | 11 +++-------- jdk/test/java/lang/ProcessHandle/TEST.properties | 4 ---- jdk/test/java/lang/ProcessHandle/TreeTest.java | 15 ++++++++------- 7 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 jdk/test/java/lang/ProcessHandle/TEST.properties diff --git a/jdk/test/java/lang/ProcessHandle/Basic.java b/jdk/test/java/lang/ProcessHandle/Basic.java index 3df63e945ee..dae37952c65 100644 --- a/jdk/test/java/lang/ProcessHandle/Basic.java +++ b/jdk/test/java/lang/ProcessHandle/Basic.java @@ -27,8 +27,8 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.io.IOException; -import java.util.Optional; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import org.testng.TestNG; @@ -36,6 +36,8 @@ import org.testng.annotations.Test; /* * @test + * @library /test/lib/share/classes + * @run testng InfoTest * @summary Basic tests for ProcessHandler * @author Roger Riggs */ diff --git a/jdk/test/java/lang/ProcessHandle/InfoTest.java b/jdk/test/java/lang/ProcessHandle/InfoTest.java index 38b1546acc0..bca423b67c3 100644 --- a/jdk/test/java/lang/ProcessHandle/InfoTest.java +++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java @@ -21,11 +21,10 @@ * questions. */ -import java.io.File; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; -import java.lang.ProcessBuilder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -40,18 +39,18 @@ import java.util.Optional; import java.util.Random; import java.util.concurrent.TimeUnit; -import jdk.testlibrary.Platform; -import jdk.testlibrary.Utils; - +import jdk.test.lib.Platform; +import jdk.test.lib.Utils; import org.testng.Assert; -import org.testng.annotations.Test; import org.testng.TestNG; +import org.testng.annotations.Test; /* * @test * @bug 8077350 8081566 8081567 8098852 8136597 - * @build jdk.testlibrary.* - * @library /lib/testlibrary + * @library /test/lib/share/classes + * @build jdk.test.lib.Platform jdk.test.lib.Utils + * @run testng InfoTest * @summary Functions of ProcessHandle.Info * @author Roger Riggs * @key intermittent diff --git a/jdk/test/java/lang/ProcessHandle/OnExitTest.java b/jdk/test/java/lang/ProcessHandle/OnExitTest.java index 9c7a5193db6..3ec997db342 100644 --- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java +++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java @@ -22,7 +22,6 @@ */ import java.io.IOException; -import java.lang.InterruptedException; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; @@ -31,7 +30,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; -import jdk.testlibrary.Utils; +import jdk.test.lib.Utils; import org.testng.annotations.Test; import org.testng.Assert; @@ -39,7 +38,9 @@ import org.testng.TestNG; /* * @test - * @build jdk.testlibrary.Utils + * @library /test/lib/share/classes + * @build jdk.test.lib.Platform jdk.test.lib.Utils + * @run testng OnExitTest * @summary Functions of Process.onExit and ProcessHandle.onExit * @author Roger Riggs */ diff --git a/jdk/test/java/lang/ProcessHandle/PermissionTest.java b/jdk/test/java/lang/ProcessHandle/PermissionTest.java index 042b9d1e818..7d596c26959 100644 --- a/jdk/test/java/lang/ProcessHandle/PermissionTest.java +++ b/jdk/test/java/lang/ProcessHandle/PermissionTest.java @@ -31,7 +31,6 @@ import java.security.Policy; import java.security.ProtectionDomain; import java.security.SecurityPermission; import java.util.Arrays; -import java.util.Optional; import java.util.PropertyPermission; import org.testng.Assert; @@ -39,6 +38,12 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; +/* + * @test + * @run testng/othervm PermissionTest + * @summary Test Permissions to access Info + */ + public class PermissionTest { /** * Backing up policy. diff --git a/jdk/test/java/lang/ProcessHandle/ProcessUtil.java b/jdk/test/java/lang/ProcessHandle/ProcessUtil.java index c0c6916f971..48654ea5f49 100644 --- a/jdk/test/java/lang/ProcessHandle/ProcessUtil.java +++ b/jdk/test/java/lang/ProcessHandle/ProcessUtil.java @@ -23,19 +23,14 @@ import java.io.IOException; import java.lang.management.ManagementFactory; -import java.lang.ProcessBuilder; import java.time.Duration; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -import com.sun.management.OperatingSystemMXBean; - -import jdk.testlibrary.Platform; - import java.util.stream.Collectors; import java.util.stream.Stream; +import com.sun.management.OperatingSystemMXBean; +import jdk.test.lib.Platform; + /** * Useful utilities for testing Process and ProcessHandle. */ diff --git a/jdk/test/java/lang/ProcessHandle/TEST.properties b/jdk/test/java/lang/ProcessHandle/TEST.properties deleted file mode 100644 index ca156321e8a..00000000000 --- a/jdk/test/java/lang/ProcessHandle/TEST.properties +++ /dev/null @@ -1,4 +0,0 @@ -# ProcessHandle tests use TestNG -TestNG.dirs = . -lib.dirs = /lib/testlibrary -modules = jdk.management diff --git a/jdk/test/java/lang/ProcessHandle/TreeTest.java b/jdk/test/java/lang/ProcessHandle/TreeTest.java index 45acc6fc205..85b752a6602 100644 --- a/jdk/test/java/lang/ProcessHandle/TreeTest.java +++ b/jdk/test/java/lang/ProcessHandle/TreeTest.java @@ -23,30 +23,31 @@ import java.io.IOException; -import java.util.ArrayList; import java.time.Duration; import java.time.Instant; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; -import java.util.concurrent.ExecutionException; -import jdk.testlibrary.Utils; + +import jdk.test.lib.Utils; import org.testng.Assert; import org.testng.TestNG; import org.testng.annotations.Test; /* * @test - * @library /lib/testlibrary - * Test counting and JavaChild.spawning and counting of Processes. - * @run testng/othervm InfoTest + * @library /test/lib/share/classes + * @build jdk.test.lib.Utils + * @run testng/othervm TreeTest + * @summary Test counting and JavaChild.spawning and counting of Processes. * @key intermittent * @author Roger Riggs */ From 017a8a1f368f0ee089618aaede86a3184a9de808 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Thu, 7 Jan 2016 21:47:21 +0530 Subject: [PATCH 24/37] 8146625: OverloadedDynamicMethod has unused ClassLoader field that can be removed Reviewed-by: attila, hannesw --- .../dynalink/beans/OverloadedDynamicMethod.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java index 44965039b80..b54b32f54d5 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java @@ -112,8 +112,7 @@ class OverloadedDynamicMethod extends DynamicMethod { /** * Holds a list of all methods. */ - private final LinkedList methods; - private final ClassLoader classLoader; + private final LinkedList methods = new LinkedList<>(); /** * Creates a new overloaded dynamic method. @@ -122,13 +121,7 @@ class OverloadedDynamicMethod extends DynamicMethod { * @param name the name of the method */ OverloadedDynamicMethod(final Class clazz, final String name) { - this(new LinkedList(), clazz.getClassLoader(), getClassAndMethodName(clazz, name)); - } - - private OverloadedDynamicMethod(final LinkedList methods, final ClassLoader classLoader, final String name) { - super(name); - this.methods = methods; - this.classLoader = classLoader; + super(getClassAndMethodName(clazz, name)); } @Override @@ -288,10 +281,6 @@ class OverloadedDynamicMethod extends DynamicMethod { return b.toString(); }; - ClassLoader getClassLoader() { - return classLoader; - } - private static boolean isApplicableDynamically(final LinkerServices linkerServices, final MethodType callSiteType, final SingleDynamicMethod m) { final MethodType methodType = m.getMethodType(); From 578184d0dc6d56c54b42f82325dcd1d628d0bb6d Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:33:50 -0800 Subject: [PATCH 25/37] Added tag jdk-9+100 for changeset b4a93b4bfc5d --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index d10b68389a6..67085b3ac37 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -342,3 +342,4 @@ cf1dc4c035fb84693d4ae5ad818785cb4d1465d1 jdk9-b90 75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97 48987460c7d49a29013963ee44d090194396bb61 jdk-9+98 7c0577bea4c65d69c5bef67023a89d2efa4fb2f7 jdk-9+99 +c1f30ac14db0eaff398429c04cd9fab92e1b4b2a jdk-9+100 From 9260d59a04c1415a2a597ef4258b67e72f0c64e3 Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:33:53 -0800 Subject: [PATCH 26/37] Added tag jdk-9+100 for changeset 9f30c43b7024 --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/corba/.hgtags b/corba/.hgtags index 9bd082d87fd..4a5ada00d4a 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -342,3 +342,4 @@ feb1bd85d7990dcf5584ca9e53104269c01db006 jdk-9+96 10a482b863582376d4ca229090334b23b05159fc jdk-9+97 ea285530245cf4e0edf0479121a41347d3030eba jdk-9+98 180212ee1d8710691ba9944593dfc1ff3e4f1532 jdk-9+99 +791d0d3ac0138faeb6110bd840a4545bc1950df2 jdk-9+100 From c06f380994ddc9777797378948a57a572a95d394 Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:33:54 -0800 Subject: [PATCH 27/37] Added tag jdk-9+100 for changeset 92ba3900f072 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index ac6cea4d970..271e5408b1a 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -502,3 +502,4 @@ a94bb7203596dd632486f1e3655fa5f70541dc08 jdk-9+96 de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97 e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98 f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99 +bdb0acafc63c42e84d9d8195bf2e2b25ee9c3306 jdk-9+100 From 0787eed6e073271cc5f38d94b956c011cb40a58c Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:33:57 -0800 Subject: [PATCH 28/37] Added tag jdk-9+100 for changeset 5c1b9db2f046 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxp/.hgtags b/jaxp/.hgtags index a88e7f5e4e5..b016abbf315 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -342,3 +342,4 @@ c8d0845877a811ab4350935892f826929359a3ff jdk-9+95 9c107c050335d7ee63b2a8b38ca5d498f19713a2 jdk-9+97 52b01339235f24c93b679bd6b8fb36a1072ad0ac jdk-9+98 52774b544850c791f1d1c67db2601b33739b18c9 jdk-9+99 +d45bcd374f6057851e3c2dcd45607cd362afadfa jdk-9+100 From 3da51532cf706c3c283564108514c510b7089573 Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:33:58 -0800 Subject: [PATCH 29/37] Added tag jdk-9+100 for changeset 871f1271713c --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 2af851e8faa..9608d22d83d 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -342,3 +342,4 @@ c021b855f51e572e63982654b17742cb1f814fb4 jdk-9+96 fdd84b2265ddce7f50e084b7c8635189bba6f012 jdk-9+97 f86ee68d1107dad41a27efc34306e0e56244a12e jdk-9+98 e1a789be1535741274c9779f4d4ca3495196b5c3 jdk-9+99 +3d452840f48299a36842760d17c0c8402f0e1266 jdk-9+100 From 19d45b40a2c648c23bc1fa11f886c9cebf75ff3c Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 7 Jan 2016 09:34:05 -0800 Subject: [PATCH 30/37] Added tag jdk-9+100 for changeset 48ffe69dacef --- nashorn/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/nashorn/.hgtags b/nashorn/.hgtags index edc7868746d..a50648283a7 100644 --- a/nashorn/.hgtags +++ b/nashorn/.hgtags @@ -333,3 +333,4 @@ d52c09d5d98a81ee6102a25f662ec4b9ae614163 jdk-9+96 2beaef2b6a880c0bff8c9f57ffca33477d647f8b jdk-9+97 68a36216f70c0de4c7e36f8978995934fc72ec03 jdk-9+98 74ddd1339c57cf2c2a13e34e1760006c2e54d1fc jdk-9+99 +da397aea8adad7e6f743b60bfe0c415fc8508df5 jdk-9+100 From 6f3a3576142949a2efc68dfd34c259682b3027bc Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Fri, 8 Jan 2016 13:06:29 +0800 Subject: [PATCH 31/37] 8146587: Mark tools/pack200/Pack200Test.java as intermittently failing Reviewed-by: darcy --- jdk/test/tools/pack200/Pack200Test.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/test/tools/pack200/Pack200Test.java b/jdk/test/tools/pack200/Pack200Test.java index 3b1e5ca86b3..9298e9723a8 100644 --- a/jdk/test/tools/pack200/Pack200Test.java +++ b/jdk/test/tools/pack200/Pack200Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,7 @@ import java.util.jar.*; /* * @test * @bug 6521334 6712743 8007902 + * @key intermittent * @summary check for memory leaks, test general packer/unpacker functionality\ * using native and java unpackers * @compile -XDignore.symbol.file Utils.java Pack200Test.java From 561f477e25839e08d2e0a1271df7c62ba9909b10 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Fri, 8 Jan 2016 09:46:02 +0100 Subject: [PATCH 32/37] 8146638: Only use compiler option files if they are really supported by the toolchain Reviewed-by: erikj --- common/autoconf/flags.m4 | 20 ++++++++++++++++++++ common/autoconf/generated-configure.sh | 25 ++++++++++++++++++++++++- make/common/NativeCompilation.gmk | 6 +++--- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index af375d28432..927bb522bcd 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -128,6 +128,26 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS], else COMPILER_TARGET_BITS_FLAG="-m" COMPILER_COMMAND_FILE_FLAG="@" + + # The solstudio linker does not support @-files. + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then + COMPILER_COMMAND_FILE_FLAG= + fi + + # Check if @file is supported by gcc + if test "x$TOOLCHAIN_TYPE" = xgcc; then + AC_MSG_CHECKING([if @file is supported by gcc]) + # Extra emtpy "" to prevent ECHO from interpreting '--version' as argument + $ECHO "" "--version" > command.file + if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then + AC_MSG_RESULT(yes) + COMPILER_COMMAND_FILE_FLAG="@" + else + AC_MSG_RESULT(no) + COMPILER_COMMAND_FILE_FLAG= + fi + rm -rf command.file + fi fi AC_SUBST(COMPILER_TARGET_BITS_FLAG) AC_SUBST(COMPILER_COMMAND_FILE_FLAG) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index f5e0859115c..e9ba080572e 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4801,7 +4801,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1450277321 +DATE_WHEN_GENERATED=1452242585 ############################################################################### # @@ -45930,6 +45930,29 @@ $as_echo "$tool_specified" >&6; } else COMPILER_TARGET_BITS_FLAG="-m" COMPILER_COMMAND_FILE_FLAG="@" + + # The solstudio linker does not support @-files. + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then + COMPILER_COMMAND_FILE_FLAG= + fi + + # Check if @file is supported by gcc + if test "x$TOOLCHAIN_TYPE" = xgcc; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if @file is supported by gcc" >&5 +$as_echo_n "checking if @file is supported by gcc... " >&6; } + # Extra emtpy "" to prevent ECHO from interpreting '--version' as argument + $ECHO "" "--version" > command.file + if $CXX @command.file 2>&5 >&5; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + COMPILER_COMMAND_FILE_FLAG="@" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + COMPILER_COMMAND_FILE_FLAG= + fi + rm -rf command.file + fi fi diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 7c4736aecbb..89a2d079a03 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -783,13 +783,13 @@ define SetupNativeCompilationBody $1_LD_OBJ_ARG := $$($1_ALL_OBJS) - # If there are many object files, use an @-file. + # If there are many object files, use an @-file... ifneq ($$(word 17, $$($1_ALL_OBJS)), ) $1_OBJ_FILE_LIST := $$($1_OBJECT_DIR)/_$1_objectfilenames.txt - ifneq ($(TOOLCHAIN_TYPE),solstudio) + ifneq ($(COMPILER_COMMAND_FILE_FLAG),) $1_LD_OBJ_ARG := $(COMPILER_COMMAND_FILE_FLAG)$$($1_OBJ_FILE_LIST) else - # The solstudio linker does not support @-files. + # ...except for toolchains which don't support them. $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)` endif endif From 4ec8fa452950c84242e67ca29b65104d533fcbaa Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Fri, 8 Jan 2016 11:12:03 +0100 Subject: [PATCH 33/37] 8146639: Fix detection of Cups headers during configuration Reviewed-by: erikj --- common/autoconf/generated-configure.sh | 28 ++++++++++++++++++++------ common/autoconf/lib-cups.m4 | 22 +++++++++++++++----- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index e9ba080572e..696006c418e 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4308,7 +4308,7 @@ pkgadd_help() { # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -4801,7 +4801,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1452242585 +DATE_WHEN_GENERATED=1452247834 ############################################################################### # @@ -51765,12 +51765,28 @@ $as_echo "$as_me: WARNING: cups not used, so --with-cups[-*] is ignored" >&2;} fi if test "x${with_cups}" != x; then - CUPS_CFLAGS="-I${with_cups}/include" - CUPS_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5 +$as_echo_n "checking for cups headers... " >&6; } + if test -s "${with_cups}/include/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups}/include" + CUPS_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 +$as_echo "$CUPS_FOUND" >&6; } + else + as_fn_error $? "Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option." "$LINENO" 5 + fi fi if test "x${with_cups_include}" != x; then - CUPS_CFLAGS="-I${with_cups_include}" - CUPS_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5 +$as_echo_n "checking for cups headers... " >&6; } + if test -s "${with_cups_include}/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups_include}" + CUPS_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 +$as_echo "$CUPS_FOUND" >&6; } + else + as_fn_error $? "Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option." "$LINENO" 5 + fi fi if test "x$CUPS_FOUND" = xno; then # Are the cups headers installed in the default /usr/include location? diff --git a/common/autoconf/lib-cups.m4 b/common/autoconf/lib-cups.m4 index 2280edba896..8a61bc04104 100644 --- a/common/autoconf/lib-cups.m4 +++ b/common/autoconf/lib-cups.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -48,12 +48,24 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS], fi if test "x${with_cups}" != x; then - CUPS_CFLAGS="-I${with_cups}/include" - CUPS_FOUND=yes + AC_MSG_CHECKING([for cups headers]) + if test -s "${with_cups}/include/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups}/include" + CUPS_FOUND=yes + AC_MSG_RESULT([$CUPS_FOUND]) + else + AC_MSG_ERROR([Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option.]) + fi fi if test "x${with_cups_include}" != x; then - CUPS_CFLAGS="-I${with_cups_include}" - CUPS_FOUND=yes + AC_MSG_CHECKING([for cups headers]) + if test -s "${with_cups_include}/cups/cups.h"; then + CUPS_CFLAGS="-I${with_cups_include}" + CUPS_FOUND=yes + AC_MSG_RESULT([$CUPS_FOUND]) + else + AC_MSG_ERROR([Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option.]) + fi fi if test "x$CUPS_FOUND" = xno; then # Are the cups headers installed in the default /usr/include location? From e24711fcf42527415ffd253ba18f5c70015b00ba Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Fri, 8 Jan 2016 11:45:57 +0000 Subject: [PATCH 34/37] 8049422: Remove @jdk.Exported Reviewed-by: dfuchs, mchung, darcy, chegar --- make/common/NON_CORE_PKGS.gmk | 3 +-- modules.xml | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk index 8d7f1a71efc..b6d92120b08 100644 --- a/make/common/NON_CORE_PKGS.gmk +++ b/make/common/NON_CORE_PKGS.gmk @@ -79,8 +79,7 @@ JCONSOLE_PKGS = com.sun.tools.jconsole TREEAPI_PKGS = com.sun.source.doctree \ com.sun.source.tree \ - com.sun.source.util \ - jdk + com.sun.source.util NASHORNAPI_PKGS = jdk.nashorn.api.scripting \ jdk.nashorn.api.tree diff --git a/modules.xml b/modules.xml index 517842f69d9..d7db4ed42d8 100644 --- a/modules.xml +++ b/modules.xml @@ -204,9 +204,6 @@ javax.security.cert - - jdk - jdk.net From 910a1d8e14452a6e69b0829148793dbdd668789f Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Fri, 8 Jan 2016 11:46:46 +0000 Subject: [PATCH 35/37] 8049422: Remove @jdk.Exported Reviewed-by: dfuchs, mchung, darcy, chegar --- .../share/classes/jdk/dynalink/beans/package-info.java | 1 - .../share/classes/jdk/dynalink/linker/package-info.java | 1 - .../share/classes/jdk/dynalink/linker/support/package-info.java | 1 - .../jdk.dynalink/share/classes/jdk/dynalink/package-info.java | 1 - .../share/classes/jdk/dynalink/support/package-info.java | 1 - .../classes/jdk/nashorn/api/scripting/AbstractJSObject.java | 1 - .../share/classes/jdk/nashorn/api/scripting/ClassFilter.java | 1 - .../share/classes/jdk/nashorn/api/scripting/JSObject.java | 1 - .../classes/jdk/nashorn/api/scripting/NashornException.java | 1 - .../classes/jdk/nashorn/api/scripting/NashornScriptEngine.java | 1 - .../jdk/nashorn/api/scripting/NashornScriptEngineFactory.java | 1 - .../classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java | 1 - .../share/classes/jdk/nashorn/api/scripting/ScriptUtils.java | 1 - .../share/classes/jdk/nashorn/api/scripting/URLReader.java | 1 - .../share/classes/jdk/nashorn/api/scripting/package-info.java | 1 - .../share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/AssignmentTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/BinaryTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/BlockTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/BreakTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/CaseTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/CatchTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java | 1 - .../classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java | 1 - .../classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ContinueTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/DebuggerTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/Diagnostic.java | 1 - .../share/classes/jdk/nashorn/api/tree/DiagnosticListener.java | 1 - .../share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ErroneousTree.java | 1 - .../classes/jdk/nashorn/api/tree/ExpressionStatementTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ExpressionTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ForInLoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ForLoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/FunctionCallTree.java | 1 - .../classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java | 1 - .../classes/jdk/nashorn/api/tree/FunctionExpressionTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/GotoTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/IdentifierTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/IfTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/InstanceOfTree.java | 1 - .../classes/jdk/nashorn/api/tree/LabeledStatementTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/LineMap.java | 1 - .../share/classes/jdk/nashorn/api/tree/LiteralTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/LoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/MemberSelectTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/NewTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/Parser.java | 1 - .../share/classes/jdk/nashorn/api/tree/PropertyTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ReturnTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/StatementTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/SwitchTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/ThrowTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/Tree.java | 2 -- .../share/classes/jdk/nashorn/api/tree/TreeVisitor.java | 1 - .../share/classes/jdk/nashorn/api/tree/TryTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/UnaryTree.java | 1 - .../classes/jdk/nashorn/api/tree/UnknownTreeException.java | 1 - .../share/classes/jdk/nashorn/api/tree/VariableTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/WhileLoopTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/WithTree.java | 1 - .../share/classes/jdk/nashorn/api/tree/package-info.java | 1 - 69 files changed, 70 deletions(-) diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java index c00a69368b5..0f154617309 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/package-info.java @@ -85,5 +85,4 @@ * Contains the linker for ordinary Java objects. * @since 1.9 */ -@jdk.Exported package jdk.dynalink.beans; diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java index 69a80d866c4..ab71a0a98fb 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/package-info.java @@ -113,5 +113,4 @@ *

* @since 1.9 */ -@jdk.Exported package jdk.dynalink.linker; diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java index fe82e727cc0..b5726e851c4 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/package-info.java @@ -89,5 +89,4 @@ *

* @since 1.9 */ -@jdk.Exported package jdk.dynalink.linker.support; diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java index 773783b29a7..e68bf14f49d 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java @@ -273,5 +273,4 @@ * from B will get a chance to link the call site in A when it encounters the * object from B. */ -@jdk.Exported package jdk.dynalink; diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java index 6ed59c0e14e..f2fe698be5a 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/support/package-info.java @@ -87,5 +87,4 @@ *

* @since 1.9 */ -@jdk.Exported package jdk.dynalink.support; diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java index 9db9dd347a3..ce2c18811ca 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java @@ -39,7 +39,6 @@ import java.util.Set; * * @since 1.8u40 */ -@jdk.Exported public abstract class AbstractJSObject implements JSObject { /** * Call this object as a JavaScript function. This is equivalent to diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java index 1a03c1768f7..a19dcd14478 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java @@ -31,7 +31,6 @@ package jdk.nashorn.api.scripting; * * @since 1.8u40 */ -@jdk.Exported public interface ClassFilter { /** * Should the Java class of the specified name be exposed to scripts? diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java index 699c7fe9070..8545bf79665 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java @@ -37,7 +37,6 @@ import jdk.nashorn.internal.runtime.JSType; * * @since 1.8u40 */ -@jdk.Exported public interface JSObject { /** * Call this object as a JavaScript function. This is equivalent to diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java index 1509a7df682..b6fa2c6d2c5 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java @@ -44,7 +44,6 @@ import jdk.nashorn.internal.runtime.ScriptObject; * * @since 1.8u40 */ -@jdk.Exported @SuppressWarnings("serial") public abstract class NashornException extends RuntimeException { // script file name diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java index 0f2f3d7ba39..801d0c8aa96 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java @@ -69,7 +69,6 @@ import jdk.nashorn.internal.runtime.options.Options; * * @since 1.8u40 */ -@jdk.Exported public final class NashornScriptEngine extends AbstractScriptEngine implements Compilable, Invocable { /** * Key used to associate Nashorn global object mirror with arbitrary Bindings instance. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java index f38244c3190..f05b7070471 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java @@ -48,7 +48,6 @@ import jdk.nashorn.internal.runtime.Version; * * @since 1.8u40 */ -@jdk.Exported public final class NashornScriptEngineFactory implements ScriptEngineFactory { @Override public String getEngineName() { diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java index e3bd9c28031..ea2f51f1e7c 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java @@ -60,7 +60,6 @@ import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; * * @since 1.8u40 */ -@jdk.Exported public final class ScriptObjectMirror extends AbstractJSObject implements Bindings { private static AccessControlContext getContextAccCtxt() { final Permissions perms = new Permissions(); diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java index 6fd52a5fe04..367efa56591 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java @@ -39,7 +39,6 @@ import jdk.nashorn.internal.runtime.linker.Bootstrap; * * @since 1.8u40 */ -@jdk.Exported public final class ScriptUtils { private ScriptUtils() {} diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java index 85a585c7f0d..cca271b8598 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java @@ -39,7 +39,6 @@ import jdk.nashorn.internal.runtime.Source; * * @since 1.8u40 */ -@jdk.Exported public final class URLReader extends Reader { // underlying URL private final URL url; diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java index 1890924f21c..95781bddb5c 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java @@ -38,5 +38,4 @@ * * @since 1.8u40 */ -@jdk.Exported package jdk.nashorn.api.scripting; diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java index ff6b84b92c4..a1373a3f197 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ArrayAccessTree extends ExpressionTree { /** * Returns the array that is accessed. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java index a4c118205bc..327b585d4ac 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java @@ -32,7 +32,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface ArrayLiteralTree extends ExpressionTree { /** * Returns the list of Array element expressions. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java index d09e1ccd85d..8199aefd3d0 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface AssignmentTree extends ExpressionTree { /** * Returns the left hand side (LHS) of this assignment. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java index b92afc549d4..84187c23dca 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface BinaryTree extends ExpressionTree { /** * Returns left hand side (LHS) of this binary expression. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java index bdb6ed195b3..efc6d86a7ec 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java @@ -39,7 +39,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface BlockTree extends StatementTree { /** * Returns the list of statements in this block. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java index 79450f32bb2..cdf7297a37a 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java @@ -37,7 +37,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface BreakTree extends GotoTree { /** * Label associated with this break statement. This is null diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java index a5c2b696e3a..4d8578dd203 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java @@ -41,7 +41,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface CaseTree extends Tree { /** * Case expression of this 'case' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java index 91e0c3e9a72..ac9b2af2139 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface CatchTree extends Tree { /** * Returns the catch parameter identifier of the exception caught. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java index 60b69ad033a..0f69ad64441 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java @@ -33,7 +33,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface CompilationUnitTree extends Tree { /** * Return the list of source elements in this compilation unit. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java index 228791f8ef2..66d4e990de3 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface CompoundAssignmentTree extends ExpressionTree { /** * Returns the left hand side (LHS) of this assignment. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java index 55b5b09c67d..0eb16e1016a 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ConditionalExpressionTree extends ExpressionTree { /** * Returns the condition expression of this ternary expression. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java index a621571daa5..103ce58c44a 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java @@ -30,7 +30,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ConditionalLoopTree extends LoopTree { /** * Returns the condition expression of this 'loop' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java index faded12757a..e1c7d4262e4 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ContinueTree extends GotoTree { /** * Label associated with this continue statement. This is null diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java index 92beb541912..70a98923234 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java @@ -35,6 +35,5 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface DebuggerTree extends StatementTree { } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java index 4fa51b74b93..5eae67eaadd 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java @@ -42,7 +42,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface Diagnostic { /** diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java index d84fe87163c..a79829f9829 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java @@ -30,7 +30,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported @FunctionalInterface public interface DiagnosticListener { /** diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java index 80632ed09a0..de4d848fe73 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java @@ -37,7 +37,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface DoWhileLoopTree extends ConditionalLoopTree { /** * Returns the condition expression of this do-while statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java index 30667b0516f..280ae6db867 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java @@ -35,5 +35,4 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface EmptyStatementTree extends StatementTree {} diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java index b335bae6a93..eb7805114aa 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java @@ -30,6 +30,5 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ErroneousTree extends ExpressionTree { } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java index 3c07edbe7b0..8881031db57 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ExpressionStatementTree extends StatementTree { /** * Returns the expression of this expression statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java index f83185541a4..7fa88a17541 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java @@ -31,5 +31,4 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ExpressionTree extends Tree {} diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java index 0e28497ec2d..84a91558501 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ForInLoopTree extends LoopTree { /** * The for..in left hand side expression. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java index 9d6e538871f..83fc3904e9c 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ForLoopTree extends ConditionalLoopTree { /** * Returns the initializer expression of this 'for' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java index 8157f13db53..82a0651ff61 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java @@ -39,7 +39,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface FunctionCallTree extends ExpressionTree { /** * Returns the function being called. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java index df55089b433..345346873fd 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java @@ -39,7 +39,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface FunctionDeclarationTree extends StatementTree { /** * Returns the name of the function being declared. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java index 40b4053e743..260eef9c555 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java @@ -39,7 +39,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface FunctionExpressionTree extends ExpressionTree { /** * Returns the name of the function being declared. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java index fb0517e170a..4c77ad47f0c 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java @@ -33,7 +33,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface GotoTree extends StatementTree { /** * Label associated with this goto statement. This is null diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java index 03035b64bfc..8af19227f2d 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface IdentifierTree extends ExpressionTree { /** * Returns the name of this identifier. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java index fe9819356cd..d0ffebfb040 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java @@ -41,7 +41,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface IfTree extends StatementTree { /** * Returns the condition expression of this 'if' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java index f1b36f9e1ae..7eb4506430e 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface InstanceOfTree extends ExpressionTree { /** * Returns the expression whose type is being checked. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java index 893fafde632..dd2c6433d88 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface LabeledStatementTree extends StatementTree { /** * Returns the label associated with this statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java index f65d39ded7c..3a4f050ff52 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java @@ -31,7 +31,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface LineMap { /** * Find the line containing a position; a line termination diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java index 4bae2d1db22..5ec1c327c7b 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface LiteralTree extends ExpressionTree { /** * Returns the value of this literal. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java index 4d2ca027863..97687059831 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java @@ -30,7 +30,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface LoopTree extends StatementTree { /** * Returns the statement contained in this 'loop' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java index d34214e718a..d145737d4db 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface MemberSelectTree extends ExpressionTree { /** * The object expression whose member is being selected. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java index 59c536d6ce2..ecad024d42d 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java @@ -37,7 +37,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface NewTree extends ExpressionTree { /** * Returns the constructor expression of this 'new' expression. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java index 76399354ba4..f287786a41e 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java @@ -32,7 +32,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface ObjectLiteralTree extends ExpressionTree { /** * Returns the list of properties of this object literal. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java index 23527422aa7..d90bc8c8d9e 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ParenthesizedTree extends ExpressionTree { /** * Returns the expression within the parenthesis. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java index 627351ab546..10bbebe2639 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java @@ -38,7 +38,6 @@ import jdk.nashorn.api.scripting.ScriptObjectMirror; * * @since 1.9 */ -@jdk.Exported public interface Parser { /** * Parses the source file and returns compilation unit tree diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java index b7bdd202d1b..fed1e42d1ed 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java @@ -30,7 +30,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface PropertyTree extends Tree { /** * Returns the name of this property. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java index d8b4a426b04..2b09e5233ce 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java @@ -30,7 +30,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface RegExpLiteralTree extends Tree { /** * Regular expression pattern to match. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java index 11fd2964a9e..765c9d713a7 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ReturnTree extends StatementTree { /** * Returns the expression being returned. This is null if no value diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java index c50823943b4..7dc58da667d 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java @@ -31,6 +31,5 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface StatementTree extends Tree { } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java index 48c1bd7e956..3c9da0e773e 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java @@ -39,7 +39,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface SwitchTree extends StatementTree { /** * Returns the expression on which this statement switches. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java index 339abb070c9..c1f0a679a3c 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface ThrowTree extends StatementTree { /** * Returns the expression being thrown. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java index 210ec56a220..13cd6f88266 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java @@ -33,13 +33,11 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface Tree { /** * Enumerates all kinds of trees. */ - @jdk.Exported public enum Kind { /** * Used for instances of {@link ArrayAccessTree}. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java index ee064b295b5..f97b5208e39 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java @@ -53,7 +53,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface TreeVisitor { /** * Visit assignment tree. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java index 59fbdcc35d0..583d560900a 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java @@ -41,7 +41,6 @@ import java.util.List; * * @since 1.9 */ -@jdk.Exported public interface TryTree extends StatementTree { /** * Returns the 'try' block of this 'try' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java index e2e1bc2895e..16fb334402b 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java @@ -38,7 +38,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface UnaryTree extends ExpressionTree { /** * Returns the expression operated by the unary operator. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java index 289256856fd..0a801b8fbfb 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public class UnknownTreeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java index aec0e6c2874..2fd4d427b16 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java @@ -35,7 +35,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface VariableTree extends StatementTree { /** * Returns the name of this variable. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java index 5910caf9a0a..63fb01a5fbc 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface WhileLoopTree extends ConditionalLoopTree { /** * The condition expression of this 'while' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java index 96c4b2a3a63..684498ca65b 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java @@ -36,7 +36,6 @@ package jdk.nashorn.api.tree; * * @since 1.9 */ -@jdk.Exported public interface WithTree extends StatementTree { /** * The scope object expression for this 'with' statement. diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java index 1c2d0488b67..725856c447f 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java @@ -70,6 +70,5 @@ * * @since 1.9 */ -@jdk.Exported package jdk.nashorn.api.tree; From 547854a41fcbb431c2ccdaea19a764513c6e24b3 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Fri, 8 Jan 2016 11:47:35 +0000 Subject: [PATCH 36/37] 8049422: Remove @jdk.Exported Reviewed-by: dfuchs, mchung, darcy, chegar --- .../java.base/share/classes/jdk/Exported.java | 80 ------------------- .../jdk/net/ExtendedSocketOptions.java | 1 - .../classes/jdk/net/NetworkPermission.java | 1 - .../share/classes/jdk/net/SocketFlow.java | 2 - .../share/classes/jdk/net/Sockets.java | 1 - .../share/classes/jdk/net/package-info.java | 1 - .../accessibility/util/AWTEventMonitor.java | 1 - .../util/AccessibilityEventMonitor.java | 1 - .../util/AccessibilityListenerList.java | 1 - .../sun/java/accessibility/util/EventID.java | 1 - .../accessibility/util/EventQueueMonitor.java | 1 - .../util/GUIInitializedListener.java | 1 - .../accessibility/util/SwingEventMonitor.java | 1 - .../util/TopLevelWindowListener.java | 1 - .../java/accessibility/util/Translator.java | 1 - .../accessibility/internal/AccessBridge.java | 1 - .../attach/AgentInitializationException.java | 1 - .../sun/tools/attach/AgentLoadException.java | 1 - .../attach/AttachNotSupportedException.java | 1 - .../AttachOperationFailedException.java | 1 - .../sun/tools/attach/AttachPermission.java | 1 - .../com/sun/tools/attach/VirtualMachine.java | 1 - .../attach/VirtualMachineDescriptor.java | 1 - .../com/sun/tools/attach/package-info.java | 1 - .../sun/tools/attach/spi/AttachProvider.java | 1 - .../sun/tools/attach/spi/package-info.java | 1 - .../com/sun/net/httpserver/Authenticator.java | 4 - .../net/httpserver/BasicAuthenticator.java | 1 - .../com/sun/net/httpserver/Filter.java | 2 - .../com/sun/net/httpserver/Headers.java | 1 - .../com/sun/net/httpserver/HttpContext.java | 1 - .../com/sun/net/httpserver/HttpExchange.java | 1 - .../com/sun/net/httpserver/HttpHandler.java | 1 - .../com/sun/net/httpserver/HttpPrincipal.java | 1 - .../com/sun/net/httpserver/HttpServer.java | 1 - .../sun/net/httpserver/HttpsConfigurator.java | 1 - .../com/sun/net/httpserver/HttpsExchange.java | 1 - .../sun/net/httpserver/HttpsParameters.java | 1 - .../com/sun/net/httpserver/HttpsServer.java | 1 - .../com/sun/net/httpserver/package-info.java | 1 - .../httpserver/spi/HttpServerProvider.java | 1 - .../sun/net/httpserver/spi/package-info.java | 1 - .../com/sun/jarsigner/ContentSigner.java | 1 - .../jarsigner/ContentSignerParameters.java | 1 - .../com/sun/jarsigner/package-info.java | 1 - .../jdk/security/jarsigner/JarSigner.java | 2 - .../jarsigner/JarSignerException.java | 1 - .../sun/tools/jconsole/JConsoleContext.java | 2 - .../sun/tools/jconsole/JConsolePlugin.java | 1 - .../com/sun/tools/jconsole/package-info.java | 1 - .../sun/jdi/AbsentInformationException.java | 1 - .../share/classes/com/sun/jdi/Accessible.java | 1 - .../classes/com/sun/jdi/ArrayReference.java | 1 - .../share/classes/com/sun/jdi/ArrayType.java | 1 - .../classes/com/sun/jdi/BooleanType.java | 1 - .../classes/com/sun/jdi/BooleanValue.java | 1 - .../share/classes/com/sun/jdi/Bootstrap.java | 1 - .../share/classes/com/sun/jdi/ByteType.java | 1 - .../share/classes/com/sun/jdi/ByteValue.java | 1 - .../share/classes/com/sun/jdi/CharType.java | 1 - .../share/classes/com/sun/jdi/CharValue.java | 1 - .../com/sun/jdi/ClassLoaderReference.java | 1 - .../com/sun/jdi/ClassNotLoadedException.java | 1 - .../sun/jdi/ClassNotPreparedException.java | 1 - .../com/sun/jdi/ClassObjectReference.java | 1 - .../share/classes/com/sun/jdi/ClassType.java | 1 - .../share/classes/com/sun/jdi/DoubleType.java | 1 - .../classes/com/sun/jdi/DoubleValue.java | 1 - .../share/classes/com/sun/jdi/Field.java | 1 - .../share/classes/com/sun/jdi/FloatType.java | 1 - .../share/classes/com/sun/jdi/FloatValue.java | 1 - .../jdi/IncompatibleThreadStateException.java | 1 - .../jdi/InconsistentDebugInfoException.java | 1 - .../classes/com/sun/jdi/IntegerType.java | 1 - .../classes/com/sun/jdi/IntegerValue.java | 1 - .../classes/com/sun/jdi/InterfaceType.java | 1 - .../com/sun/jdi/InternalException.java | 1 - .../sun/jdi/InvalidCodeIndexException.java | 1 - .../sun/jdi/InvalidLineNumberException.java | 1 - .../sun/jdi/InvalidStackFrameException.java | 1 - .../com/sun/jdi/InvalidTypeException.java | 1 - .../com/sun/jdi/InvocationException.java | 1 - .../classes/com/sun/jdi/JDIPermission.java | 1 - .../classes/com/sun/jdi/LocalVariable.java | 1 - .../share/classes/com/sun/jdi/Locatable.java | 1 - .../share/classes/com/sun/jdi/Location.java | 1 - .../share/classes/com/sun/jdi/LongType.java | 1 - .../share/classes/com/sun/jdi/LongValue.java | 1 - .../share/classes/com/sun/jdi/Method.java | 1 - .../share/classes/com/sun/jdi/Mirror.java | 1 - .../classes/com/sun/jdi/MonitorInfo.java | 1 - .../com/sun/jdi/NativeMethodException.java | 1 - .../com/sun/jdi/ObjectCollectedException.java | 1 - .../classes/com/sun/jdi/ObjectReference.java | 1 - .../sun/jdi/PathSearchingVirtualMachine.java | 1 - .../classes/com/sun/jdi/PrimitiveType.java | 1 - .../classes/com/sun/jdi/PrimitiveValue.java | 1 - .../classes/com/sun/jdi/ReferenceType.java | 1 - .../share/classes/com/sun/jdi/ShortType.java | 1 - .../share/classes/com/sun/jdi/ShortValue.java | 1 - .../share/classes/com/sun/jdi/StackFrame.java | 1 - .../classes/com/sun/jdi/StringReference.java | 1 - .../com/sun/jdi/ThreadGroupReference.java | 1 - .../classes/com/sun/jdi/ThreadReference.java | 1 - .../share/classes/com/sun/jdi/Type.java | 1 - .../classes/com/sun/jdi/TypeComponent.java | 1 - .../sun/jdi/VMCannotBeModifiedException.java | 1 - .../com/sun/jdi/VMDisconnectedException.java | 1 - .../com/sun/jdi/VMMismatchException.java | 1 - .../com/sun/jdi/VMOutOfMemoryException.java | 1 - .../share/classes/com/sun/jdi/Value.java | 1 - .../classes/com/sun/jdi/VirtualMachine.java | 1 - .../com/sun/jdi/VirtualMachineManager.java | 1 - .../share/classes/com/sun/jdi/VoidType.java | 1 - .../share/classes/com/sun/jdi/VoidValue.java | 1 - .../sun/jdi/connect/AttachingConnector.java | 1 - .../com/sun/jdi/connect/Connector.java | 6 -- .../IllegalConnectorArgumentsException.java | 1 - .../sun/jdi/connect/LaunchingConnector.java | 1 - .../sun/jdi/connect/ListeningConnector.java | 1 - .../com/sun/jdi/connect/Transport.java | 1 - .../connect/TransportTimeoutException.java | 1 - .../com/sun/jdi/connect/VMStartException.java | 1 - .../com/sun/jdi/connect/package-info.java | 1 - .../spi/ClosedConnectionException.java | 1 - .../com/sun/jdi/connect/spi/Connection.java | 1 - .../sun/jdi/connect/spi/TransportService.java | 3 - .../com/sun/jdi/connect/spi/package-info.java | 1 - .../sun/jdi/event/AccessWatchpointEvent.java | 1 - .../com/sun/jdi/event/BreakpointEvent.java | 1 - .../com/sun/jdi/event/ClassPrepareEvent.java | 1 - .../com/sun/jdi/event/ClassUnloadEvent.java | 1 - .../classes/com/sun/jdi/event/Event.java | 1 - .../com/sun/jdi/event/EventIterator.java | 1 - .../classes/com/sun/jdi/event/EventQueue.java | 1 - .../classes/com/sun/jdi/event/EventSet.java | 1 - .../com/sun/jdi/event/ExceptionEvent.java | 1 - .../com/sun/jdi/event/LocatableEvent.java | 1 - .../com/sun/jdi/event/MethodEntryEvent.java | 1 - .../com/sun/jdi/event/MethodExitEvent.java | 1 - .../event/ModificationWatchpointEvent.java | 1 - .../jdi/event/MonitorContendedEnterEvent.java | 1 - .../event/MonitorContendedEnteredEvent.java | 1 - .../com/sun/jdi/event/MonitorWaitEvent.java | 1 - .../com/sun/jdi/event/MonitorWaitedEvent.java | 1 - .../classes/com/sun/jdi/event/StepEvent.java | 1 - .../com/sun/jdi/event/ThreadDeathEvent.java | 1 - .../com/sun/jdi/event/ThreadStartEvent.java | 1 - .../com/sun/jdi/event/VMDeathEvent.java | 1 - .../com/sun/jdi/event/VMDisconnectEvent.java | 1 - .../com/sun/jdi/event/VMStartEvent.java | 1 - .../com/sun/jdi/event/WatchpointEvent.java | 1 - .../com/sun/jdi/event/package-info.java | 1 - .../classes/com/sun/jdi/package-info.java | 1 - .../jdi/request/AccessWatchpointRequest.java | 1 - .../sun/jdi/request/BreakpointRequest.java | 1 - .../sun/jdi/request/ClassPrepareRequest.java | 1 - .../sun/jdi/request/ClassUnloadRequest.java | 1 - .../request/DuplicateRequestException.java | 1 - .../com/sun/jdi/request/EventRequest.java | 1 - .../sun/jdi/request/EventRequestManager.java | 1 - .../com/sun/jdi/request/ExceptionRequest.java | 1 - .../request/InvalidRequestStateException.java | 1 - .../sun/jdi/request/MethodEntryRequest.java | 1 - .../sun/jdi/request/MethodExitRequest.java | 1 - .../ModificationWatchpointRequest.java | 1 - .../request/MonitorContendedEnterRequest.java | 1 - .../MonitorContendedEnteredRequest.java | 1 - .../sun/jdi/request/MonitorWaitRequest.java | 1 - .../sun/jdi/request/MonitorWaitedRequest.java | 1 - .../com/sun/jdi/request/StepRequest.java | 1 - .../sun/jdi/request/ThreadDeathRequest.java | 1 - .../sun/jdi/request/ThreadStartRequest.java | 1 - .../com/sun/jdi/request/VMDeathRequest.java | 1 - .../sun/jdi/request/WatchpointRequest.java | 1 - .../com/sun/jdi/request/package-info.java | 1 - .../GarbageCollectionNotificationInfo.java | 1 - .../management/GarbageCollectorMXBean.java | 1 - .../classes/com/sun/management/GcInfo.java | 1 - .../management/HotSpotDiagnosticMXBean.java | 1 - .../sun/management/OperatingSystemMXBean.java | 1 - .../com/sun/management/ThreadMXBean.java | 1 - .../management/UnixOperatingSystemMXBean.java | 1 - .../classes/com/sun/management/VMOption.java | 2 - .../com/sun/management/package-info.java | 1 - .../nio/sctp/AbstractNotificationHandler.java | 1 - .../classes/com/sun/nio/sctp/Association.java | 1 - .../sctp/AssociationChangeNotification.java | 2 - .../com/sun/nio/sctp/HandlerResult.java | 1 - .../sun/nio/sctp/IllegalReceiveException.java | 1 - .../sun/nio/sctp/IllegalUnbindException.java | 1 - .../sun/nio/sctp/InvalidStreamException.java | 1 - .../classes/com/sun/nio/sctp/MessageInfo.java | 1 - .../com/sun/nio/sctp/Notification.java | 1 - .../com/sun/nio/sctp/NotificationHandler.java | 1 - .../sctp/PeerAddressChangeNotification.java | 2 - .../classes/com/sun/nio/sctp/SctpChannel.java | 1 - .../com/sun/nio/sctp/SctpMultiChannel.java | 1 - .../com/sun/nio/sctp/SctpServerChannel.java | 1 - .../com/sun/nio/sctp/SctpSocketOption.java | 1 - .../nio/sctp/SctpStandardSocketOptions.java | 2 - .../sun/nio/sctp/SendFailedNotification.java | 1 - .../sun/nio/sctp/ShutdownNotification.java | 1 - .../com/sun/nio/sctp/package-info.java | 1 - .../com/sun/security/auth/LdapPrincipal.java | 1 - .../sun/security/auth/NTDomainPrincipal.java | 1 - .../security/auth/NTNumericCredential.java | 1 - .../classes/com/sun/security/auth/NTSid.java | 1 - .../security/auth/NTSidDomainPrincipal.java | 1 - .../security/auth/NTSidGroupPrincipal.java | 1 - .../auth/NTSidPrimaryGroupPrincipal.java | 1 - .../sun/security/auth/NTSidUserPrincipal.java | 1 - .../sun/security/auth/NTUserPrincipal.java | 1 - .../com/sun/security/auth/PolicyFile.java | 1 - .../security/auth/PrincipalComparator.java | 1 - .../auth/SolarisNumericGroupPrincipal.java | 1 - .../auth/SolarisNumericUserPrincipal.java | 1 - .../sun/security/auth/SolarisPrincipal.java | 1 - .../auth/UnixNumericGroupPrincipal.java | 1 - .../auth/UnixNumericUserPrincipal.java | 1 - .../com/sun/security/auth/UnixPrincipal.java | 1 - .../com/sun/security/auth/UserPrincipal.java | 1 - .../com/sun/security/auth/X500Principal.java | 1 - .../auth/callback/TextCallbackHandler.java | 1 - .../security/auth/callback/package-info.java | 1 - .../sun/security/auth/login/ConfigFile.java | 1 - .../sun/security/auth/login/package-info.java | 1 - .../security/auth/module/JndiLoginModule.java | 1 - .../auth/module/KeyStoreLoginModule.java | 1 - .../security/auth/module/Krb5LoginModule.java | 1 - .../security/auth/module/LdapLoginModule.java | 1 - .../security/auth/module/NTLoginModule.java | 1 - .../sun/security/auth/module/NTSystem.java | 1 - .../auth/module/SolarisLoginModule.java | 1 - .../security/auth/module/SolarisSystem.java | 1 - .../security/auth/module/UnixLoginModule.java | 1 - .../sun/security/auth/module/UnixSystem.java | 1 - .../security/auth/module/package-info.java | 1 - .../com/sun/security/auth/package-info.java | 1 - .../security/jgss/AuthorizationDataEntry.java | 1 - .../sun/security/jgss/ExtendedGSSContext.java | 1 - .../security/jgss/ExtendedGSSCredential.java | 1 - .../com/sun/security/jgss/GSSUtil.java | 1 - .../jgss/InquireSecContextPermission.java | 1 - .../com/sun/security/jgss/InquireType.java | 1 - .../com/sun/security/jgss/package-info.java | 1 - 246 files changed, 343 deletions(-) delete mode 100644 jdk/src/java.base/share/classes/jdk/Exported.java diff --git a/jdk/src/java.base/share/classes/jdk/Exported.java b/jdk/src/java.base/share/classes/jdk/Exported.java deleted file mode 100644 index d67d8b37e99..00000000000 --- a/jdk/src/java.base/share/classes/jdk/Exported.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package jdk; - -import java.lang.annotation.*; - -/** - * Indicates whether or not a JDK specific type or package is an - * exported part of the JDK suitable for use outside of the JDK - * implementation itself. - * - * This annotation should only be applied to types and packages - * outside of the Java SE namespaces of {@code java.*} and - * {@code javax.*} packages. For example, certain portions of {@code - * com.sun.*} are official parts of the JDK meant to be generally - * usable while other portions of {@code com.sun.*} are not. This - * annotation type allows those portions to be easily and - * programmatically distinguished. - * - *

If in one release a type or package is - * @Exported(true), in a subsequent major release such a - * type or package can transition to @Exported(false). - * - *

If a type or package is @Exported(false) in a - * release, it may be removed in a subsequent major release. - * - *

If a top-level type has an @Exported annotation, - * any nested member types with the top-level type should have an - * @Exported annotation with the same value. - * - * (In exceptional cases, if a nested type is going to be removed - * before its enclosing type, the nested type's could be - * @Exported(false) while its enclosing type was - * @Exported(true).) - * - * Likewise, if a package has an @Exported annotation, - * top-level types within that package should also have an - * @Exported annotation. - * - * Sometimes a top-level type may have a different - * @Exported value than its package. - * - * @since 1.8 - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE, ElementType.PACKAGE}) -@Exported -public @interface Exported { - /** - * Whether or not the annotated type or package is an exported - * part of the JDK. - * @return whether or not the annotated type or package is an exported - * part of the JDK - */ - boolean value() default true; -} diff --git a/jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java b/jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java index a44560b4597..12af5aff7ee 100644 --- a/jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java +++ b/jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java @@ -34,7 +34,6 @@ import java.net.SocketOption; * * @since 1.8 */ -@jdk.Exported public final class ExtendedSocketOptions { private static class ExtSocketOption implements SocketOption { diff --git a/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java b/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java index df740da8488..285f305652f 100644 --- a/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java +++ b/jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java @@ -61,7 +61,6 @@ import java.security.BasicPermission; * @since 1.8 */ -@jdk.Exported public final class NetworkPermission extends BasicPermission { private static final long serialVersionUID = -2012939586906722291L; diff --git a/jdk/src/java.base/share/classes/jdk/net/SocketFlow.java b/jdk/src/java.base/share/classes/jdk/net/SocketFlow.java index 3d673d1fc44..12d1ed386d1 100644 --- a/jdk/src/java.base/share/classes/jdk/net/SocketFlow.java +++ b/jdk/src/java.base/share/classes/jdk/net/SocketFlow.java @@ -45,7 +45,6 @@ import java.lang.annotation.Native; * * @since 1.8 */ -@jdk.Exported public class SocketFlow { private static final int UNSET = -1; @@ -68,7 +67,6 @@ public class SocketFlow { * * @since 1.8 */ - @jdk.Exported public enum Status { /** * Set or get socket option has not been called yet. Status diff --git a/jdk/src/java.base/share/classes/jdk/net/Sockets.java b/jdk/src/java.base/share/classes/jdk/net/Sockets.java index bf096c01bf4..1ba53f29a15 100644 --- a/jdk/src/java.base/share/classes/jdk/net/Sockets.java +++ b/jdk/src/java.base/share/classes/jdk/net/Sockets.java @@ -55,7 +55,6 @@ import sun.net.ExtendedOptionsImpl; * * @see java.nio.channels.NetworkChannel */ -@jdk.Exported public class Sockets { private static final HashMap,Set>> diff --git a/jdk/src/java.base/share/classes/jdk/net/package-info.java b/jdk/src/java.base/share/classes/jdk/net/package-info.java index fd824f6fd1d..97b3ef1bb82 100644 --- a/jdk/src/java.base/share/classes/jdk/net/package-info.java +++ b/jdk/src/java.base/share/classes/jdk/net/package-info.java @@ -30,5 +30,4 @@ * @since 1.8 */ -@jdk.Exported package jdk.net; diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java index 257bbb72953..cd3cf14164e 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java @@ -45,7 +45,6 @@ import sun.awt.AWTPermissions; * level support for capturing the top-level containers as they are created. */ -@jdk.Exported public class AWTEventMonitor { /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java index 4719e7c12de..603ba035ae7 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java @@ -43,7 +43,6 @@ import javax.accessibility.*; * */ -@jdk.Exported public class AccessibilityEventMonitor { // listeners diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java index 76c7147ea09..0de59f95244 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityListenerList.java @@ -37,7 +37,6 @@ import javax.accessibility.*; * */ -@jdk.Exported public class AccessibilityListenerList { /* A null array to be shared by all empty listener lists */ private final static Object[] NULL_ARRAY = new Object[0]; diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java index bbd08f534e9..f984034b49f 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventID.java @@ -35,7 +35,6 @@ package com.sun.java.accessibility.util; * @see SwingEventMonitor * */ -@jdk.Exported public class EventID { /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java index aa87860bb48..4751ea0eba4 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java @@ -40,7 +40,6 @@ import java.security.PrivilegedAction; * @see AWTEventMonitor * @see SwingEventMonitor */ -@jdk.Exported public class EventQueueMonitor implements AWTEventListener { diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java index 9a4474d3e6b..02d706e3c0b 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/GUIInitializedListener.java @@ -49,7 +49,6 @@ import javax.accessibility.*; * @see EventQueueMonitor#removeGUIInitializedListener * */ -@jdk.Exported public interface GUIInitializedListener extends EventListener { /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java index c2150cd78f8..bbb0fcb18b3 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java @@ -56,7 +56,6 @@ import javax.accessibility.*; * @see AWTEventMonitor * */ -@jdk.Exported public class SwingEventMonitor extends AWTEventMonitor { /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java index 94d03307a7a..f24140c8668 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/TopLevelWindowListener.java @@ -43,7 +43,6 @@ import javax.accessibility.*; * @see EventQueueMonitor#removeTopLevelWindowListener * */ -@jdk.Exported public interface TopLevelWindowListener extends EventListener { /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java index 743777cbe72..177fbb4403c 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java @@ -58,7 +58,6 @@ import javax.accessibility.*; * to implement accessibility features for a toolkit. Instead of relying upon this * code, a toolkit's components should implement interface {@code Accessible} directly. */ -@jdk.Exported public class Translator extends AccessibleContext implements Accessible, AccessibleComponent { diff --git a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java index 47832a4455b..5ab82f3aa2c 100644 --- a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java +++ b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java @@ -53,7 +53,6 @@ import java.util.concurrent.CountDownLatch; * Note: This class has to be public. It's loaded from the VM like this: * Class.forName(atName).newInstance(); */ -@jdk.Exported(false) final public class AccessBridge { private static AccessBridge theAccessBridge; diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java index 058b0f0048f..3ec14536f92 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java @@ -40,7 +40,6 @@ package com.sun.tools.attach; * the error returned by the agent's {@code Agent_OnAttach} function. * This error code can be obtained by invoking the {@link #returnValue() returnValue} method. */ -@jdk.Exported public class AgentInitializationException extends Exception { /** use serialVersionUID for interoperability */ diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java index 8b04c46c689..1f224105b25 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AgentLoadException.java @@ -36,7 +36,6 @@ package com.sun.tools.attach; * com.sun.tools.attach.VirtualMachine#loadAgentPath loadAgentPath} methods * if the agent, or agent library, cannot be loaded. */ -@jdk.Exported public class AgentLoadException extends Exception { /** use serialVersionUID for interoperability */ diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java index fb551866d2b..f9f7476883b 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java @@ -36,7 +36,6 @@ import com.sun.tools.attach.spi.AttachProvider; // for javadoc * AttachProvider.attachVirtualMachine} if the provider attempts to * attach to a Java virtual machine with which it not comptatible. */ -@jdk.Exported public class AttachNotSupportedException extends Exception { /** use serialVersionUID for interoperability */ diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java index fd37bb3f732..c245ec78716 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java @@ -37,7 +37,6 @@ import java.io.IOException; * * @since 1.9 */ -@jdk.Exported public class AttachOperationFailedException extends IOException { private static final long serialVersionUID = 2140308168167478043L; diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java index 0f573e8dff4..e5dc6afe32c 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java @@ -79,7 +79,6 @@ package com.sun.tools.attach; * @see com.sun.tools.attach.spi.AttachProvider */ -@jdk.Exported public final class AttachPermission extends java.security.BasicPermission { /** use serialVersionUID for interoperability */ diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java index a9a9a56fdb5..345df5ee451 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachine.java @@ -96,7 +96,6 @@ import java.io.IOException; * @since 1.6 */ -@jdk.Exported public abstract class VirtualMachine { private AttachProvider provider; private String id; diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java index b8d4ad6be3c..4f6e77cac52 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java @@ -55,7 +55,6 @@ import com.sun.tools.attach.spi.AttachProvider; * * @since 1.6 */ -@jdk.Exported public class VirtualMachineDescriptor { private AttachProvider provider; diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java index 465e3fd2ac5..38496385b05 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java @@ -38,5 +38,4 @@ * @since 1.6 */ -@jdk.Exported package com.sun.tools.attach; diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java index 2d9aa9cfbc2..0ca0539f4ef 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/AttachProvider.java @@ -74,7 +74,6 @@ import java.util.ServiceLoader; * @since 1.6 */ -@jdk.Exported public abstract class AttachProvider { private static final Object lock = new Object(); diff --git a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java index b2c68ebe5a0..9817b191be4 100644 --- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi/package-info.java @@ -31,5 +31,4 @@ * @since 1.6 */ -@jdk.Exported package com.sun.tools.attach.spi; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java index cdce078da59..5b7445da6de 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java @@ -36,7 +36,6 @@ import java.util.*; * Note. This implies that any caching of credentials or other authentication * information must be done outside of this class. */ -@jdk.Exported public abstract class Authenticator { /** @@ -48,7 +47,6 @@ public abstract class Authenticator { * Indicates an authentication failure. The authentication * attempt has completed. */ - @jdk.Exported public static class Failure extends Result { private int responseCode; @@ -70,7 +68,6 @@ public abstract class Authenticator { * authenticated user principal can be acquired by calling * getPrincipal(). */ - @jdk.Exported public static class Success extends Result { private HttpPrincipal principal; @@ -92,7 +89,6 @@ public abstract class Authenticator { * set any necessary response headers in the given HttpExchange * before returning this Retry object. */ - @jdk.Exported public static class Retry extends Result { private int responseCode; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java index eb870310739..c9701c0c503 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java @@ -33,7 +33,6 @@ import java.util.Base64; * to provide an implementation of {@link #checkCredentials(String,String)} * which is called to verify each incoming request. */ -@jdk.Exported public abstract class BasicAuthenticator extends Authenticator { protected String realm; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java index ac5d6fe718b..70ca21e4920 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java @@ -39,7 +39,6 @@ import java.util.*; * exchange handler. * @since 1.6 */ -@jdk.Exported public abstract class Filter { protected Filter () {} @@ -49,7 +48,6 @@ public abstract class Filter { * Each filter in the chain is given one of these * so it can invoke the next filter in the chain */ - @jdk.Exported public static class Chain { /* the last element in the chain must invoke the users * handler diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java index 5c0608b84fa..2569060aa47 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java @@ -61,7 +61,6 @@ import java.util.*; * as a header line containing the key but no associated value. * @since 1.6 */ -@jdk.Exported public class Headers implements Map> { HashMap> map; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java index 169e4a09f11..12ffdcce384 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java @@ -40,7 +40,6 @@ import java.util.*; * context can be pre- and post-processed by each Filter in the chain. * @since 1.6 */ -@jdk.Exported public abstract class HttpContext { protected HttpContext () { diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java index 0cf3623cf3d..0ce0b1220b1 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java @@ -64,7 +64,6 @@ import java.util.*; * @since 1.6 */ -@jdk.Exported public abstract class HttpExchange { protected HttpExchange () { diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java index 62b621cd3a9..8ea7024e686 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java @@ -32,7 +32,6 @@ import java.io.IOException; * HTTP exchange is handled by one of these handlers. * @since 1.6 */ -@jdk.Exported public interface HttpHandler { /** * Handle the given request and generate an appropriate response. diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java index df5e4228ac6..b0b6bdc84a8 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java @@ -33,7 +33,6 @@ import java.security.Principal; * Represents a user authenticated by HTTP Basic or Digest * authentication. */ -@jdk.Exported public class HttpPrincipal implements Principal { private String username, realm; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java index f26dc1d65df..30ad5cec7f2 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java @@ -87,7 +87,6 @@ import com.sun.net.httpserver.spi.HttpServerProvider; * @since 1.6 */ -@jdk.Exported public abstract class HttpServer { /** diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java index 22bca16346d..6c4ddae65ad 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java @@ -67,7 +67,6 @@ import javax.net.ssl.*; * * @since 1.6 */ -@jdk.Exported public class HttpsConfigurator { private SSLContext context; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java index 99a2733cf12..9bf9ed7d875 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsExchange.java @@ -39,7 +39,6 @@ import java.util.*; * @since 1.6 */ -@jdk.Exported public abstract class HttpsExchange extends HttpExchange { protected HttpsExchange () { diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java index f3fd7a6e572..0aabee08be1 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsParameters.java @@ -49,7 +49,6 @@ import javax.net.ssl.SSLParameters; * are used, and any settings made in this object are ignored. * @since 1.6 */ -@jdk.Exported public abstract class HttpsParameters { private String[] cipherSuites; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java index f7eb542c9ba..ddf05472504 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java @@ -45,7 +45,6 @@ import com.sun.net.httpserver.spi.*; * @since 1.6 */ -@jdk.Exported public abstract class HttpsServer extends HttpServer { /** diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java index 84f13d61226..9737f97cca7 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java @@ -123,5 +123,4 @@ @since 1.6 */ -@jdk.Exported package com.sun.net.httpserver; diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java index c838bd5a28d..df3efc92e63 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java @@ -40,7 +40,6 @@ import com.sun.net.httpserver.*; * {@link HttpServer} and associated classes. Applications do not normally use * this class. See {@link #provider()} for how providers are found and loaded. */ -@jdk.Exported public abstract class HttpServerProvider { /** diff --git a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java index 8c4d318a858..da8fecbd7c0 100644 --- a/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java +++ b/jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/package-info.java @@ -27,5 +27,4 @@ * Provides a pluggable service provider interface, which allows the HTTP server * implementation to be replaced with other implementations. */ -@jdk.Exported package com.sun.net.httpserver.spi; diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java index 4de54e95083..0976535946b 100644 --- a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java +++ b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java @@ -38,7 +38,6 @@ import java.security.cert.CertificateException; * @deprecated This class has been deprecated. */ -@jdk.Exported @Deprecated public abstract class ContentSigner { diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java index 3a45318b316..e761a2c9205 100644 --- a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java +++ b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java @@ -36,7 +36,6 @@ import java.util.zip.ZipFile; * @author Vincent Ryan * @deprecated This class has been deprecated. */ -@jdk.Exported @Deprecated public interface ContentSignerParameters { diff --git a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java index cfed536a9eb..08197b5f6e6 100644 --- a/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java +++ b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java @@ -35,5 +35,4 @@ * to sign JAR files. */ -@jdk.Exported package com.sun.jarsigner; diff --git a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java index b9ce4e30225..a25ff87513c 100644 --- a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java +++ b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java @@ -79,7 +79,6 @@ import java.util.zip.ZipOutputStream; * * @since 1.9 */ -@jdk.Exported public final class JarSigner { /** @@ -88,7 +87,6 @@ public final class JarSigner { * * @since 1.9 */ - @jdk.Exported public static class Builder { // Signer materials: diff --git a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java index a6c73a68af4..d1b5449dbef 100644 --- a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java +++ b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSignerException.java @@ -30,7 +30,6 @@ package jdk.security.jarsigner; * * @since 1.9 */ -@jdk.Exported public class JarSignerException extends RuntimeException { private static final long serialVersionUID = -4732217075689309530L; diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java index fd941b87fea..e324109f05d 100644 --- a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java +++ b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsoleContext.java @@ -42,7 +42,6 @@ import javax.swing.event.SwingPropertyChangeSupport; * * @since 1.6 */ -@jdk.Exported public interface JConsoleContext { /** * The {@link ConnectionState ConnectionState} bound property name. @@ -53,7 +52,6 @@ public interface JConsoleContext { * Values for the {@linkplain #CONNECTION_STATE_PROPERTY * ConnectionState} bound property. */ - @jdk.Exported public enum ConnectionState { /** * The connection has been successfully established. diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java index 48f43dc1ec8..04da16e4897 100644 --- a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java +++ b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java @@ -72,7 +72,6 @@ import javax.swing.SwingWorker; * * @since 1.6 */ -@jdk.Exported public abstract class JConsolePlugin { private volatile JConsoleContext context = null; private List listeners = null; diff --git a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java index 99b52aa3728..d9369d03a9b 100644 --- a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java +++ b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/package-info.java @@ -29,5 +29,4 @@ * @since 1.6 */ -@jdk.Exported package com.sun.tools.jconsole; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java index 36ac31ede8f..6a2188ee191 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java @@ -31,7 +31,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class AbsentInformationException extends Exception { private static final long serialVersionUID = 4988939309582416373L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java index ba2463ad205..8d3ef267bfa 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java @@ -36,7 +36,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Accessible { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java index d4cf64bf863..11b5bdbcf70 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayReference.java @@ -39,7 +39,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ArrayReference extends ObjectReference { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java index 45c4f4d6406..d693c0e6195 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java @@ -38,7 +38,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ArrayType extends ReferenceType { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java index 7bf98c8fd99..6e54580044d 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface BooleanType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java index 73297fa7cfb..aca19cf130b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/BooleanValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface BooleanValue extends PrimitiveValue { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java index 623a7a4d5a9..2e639148d1e 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Bootstrap.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @since 1.3 */ -@jdk.Exported public class Bootstrap extends Object { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java index dc83cc3977a..6296aa51862 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ByteType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java index a16ecd0ff8b..89074aab4b0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ByteValue.java @@ -33,7 +33,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ByteValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java index fab5a16ed6d..0710db0e462 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface CharType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java index 2f9d630f1c8..e85348b67ea 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/CharValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface CharValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java index b8363aef870..9340bab4fe4 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassLoaderReference.java @@ -39,7 +39,6 @@ import java.util.List; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface ClassLoaderReference extends ObjectReference { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java index ab516e06e50..790f8d0d1b8 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java @@ -67,7 +67,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class ClassNotLoadedException extends Exception { private static final long serialVersionUID = -6242978768444298722L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java index 528b36e9648..f30e87f2474 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class ClassNotPreparedException extends RuntimeException { private static final long serialVersionUID = -6120698967144079642L; public ClassNotPreparedException() diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java index 79a306a075d..1670ceadd91 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassObjectReference.java @@ -35,7 +35,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface ClassObjectReference extends ObjectReference { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java index 296f2e730fa..3286c73796f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java @@ -41,7 +41,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ClassType extends ReferenceType { /** * Gets the superclass of this class. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java index d40da78a745..41172bf808d 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface DoubleType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java index e2f9cc2f25a..82e9eec1b07 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/DoubleValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface DoubleValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java index 6842a81fa78..206e9812bb7 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Field.java @@ -38,7 +38,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Field extends TypeComponent, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java index 29cb99a6df3..a585eadb879 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface FloatType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java index aa3be62a525..bb966bcdbf1 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/FloatValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface FloatValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java index 11e110ff075..1fd8e713d52 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class IncompatibleThreadStateException extends Exception { private static final long serialVersionUID = 6199174323414551389L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java index 8fe3ae91392..305efa06e09 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class InconsistentDebugInfoException extends RuntimeException { private static final long serialVersionUID = 7964236415376861808L; public InconsistentDebugInfoException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java index f19b6de34fd..cf4edd0e587 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface IntegerType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java index b8a10a89f92..d0bd44a26b8 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/IntegerValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface IntegerValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java index 80250de8a5d..64a9fa48ee0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java @@ -43,7 +43,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface InterfaceType extends ReferenceType { /** * Gets the interfaces directly extended by this interface. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java index b688ca54e11..a291ac196e5 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class InternalException extends RuntimeException { private static final long serialVersionUID = -9171606393104480607L; private int errorCode; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java index 928f74198d6..3e62cf8df84 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported @Deprecated public class InvalidCodeIndexException extends RuntimeException { private static final long serialVersionUID = 7416010225133747805L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java index 0786d52ba00..bc40ea6e8b8 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported @Deprecated public class InvalidLineNumberException extends RuntimeException { private static final long serialVersionUID = 4048709912372692875L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java index 2f28d07ba22..e57bfa53454 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class InvalidStackFrameException extends RuntimeException { private static final long serialVersionUID = -1919378296505827922L; public InvalidStackFrameException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java index 299c4474322..904248ccb03 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public class InvalidTypeException extends Exception { private static final long serialVersionUID = 2256667231949650806L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java index 1f8179e1f0f..4e66f601b96 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class InvocationException extends Exception { private static final long serialVersionUID = 6066780907971918568L; ObjectReference exception; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java index 0f4abb258a8..109500afc97 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java @@ -78,7 +78,6 @@ package com.sun.jdi; * */ -@jdk.Exported public final class JDIPermission extends java.security.BasicPermission { private static final long serialVersionUID = -6988461416938786271L; /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java index 4b15d91c604..09308015dfc 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java @@ -42,7 +42,6 @@ package com.sun.jdi; * @since 1.3 */ -@jdk.Exported public interface LocalVariable extends Mirror, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java index a0089436a78..16db7bff8ce 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java @@ -33,7 +33,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Locatable { /** * Returns the {@link Location} of this mirror, if there is diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java index e508781c274..b17f2418b9d 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Location.java @@ -86,7 +86,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Location extends Mirror, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java index f3cc7364f44..3ce46a5660c 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface LongType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java index 98e25c2a4a9..e3f33a7c65c 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/LongValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface LongValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java index 39cde3ea73c..02d6ae9bba6 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Method.java @@ -39,7 +39,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Method extends TypeComponent, Locatable, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java index eb01abfb682..e9f88871409 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Mirror.java @@ -56,7 +56,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java index ef72517b9b1..29aae2c2876 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/MonitorInfo.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @since 1.6 */ -@jdk.Exported public interface MonitorInfo extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java index 63797014f70..2708c20deea 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class NativeMethodException extends RuntimeException { private static final long serialVersionUID = 3924951669039469992L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java index b88395e36b3..b088064e97c 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class ObjectCollectedException extends RuntimeException { private static final long serialVersionUID = -1928428056197269588L; public ObjectCollectedException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java index b6bf5a3eb19..629fdb86a45 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java @@ -55,7 +55,6 @@ import java.util.Map; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ObjectReference extends Value { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java index 7a75fd614f0..adc6b76cc05 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java @@ -33,7 +33,6 @@ import java.util.List; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface PathSearchingVirtualMachine extends VirtualMachine { /** * Get the class path for this virtual machine. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java index 9cc721f4b28..b4315b2286c 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveType.java @@ -37,6 +37,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface PrimitiveType extends Type { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java index 96014881007..e33be4788bc 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/PrimitiveValue.java @@ -35,7 +35,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface PrimitiveValue extends Value { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java index 43d1c023db6..30052d547bd 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java @@ -77,7 +77,6 @@ import java.util.Map; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ReferenceType extends Type, Comparable, Accessible { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java index 9e0a2a9c51a..cfff5407cc0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ShortType extends PrimitiveType { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java index 61e54ec24f2..6cedd8da48e 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ShortValue.java @@ -34,7 +34,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ShortValue extends PrimitiveValue, Comparable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java index 9d51d8adb77..7b330c76622 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java @@ -58,7 +58,6 @@ import java.util.Map; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface StackFrame extends Mirror, Locatable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java index 92e7167852f..8a1053a27a1 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java @@ -35,7 +35,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface StringReference extends ObjectReference { /** * Returns the StringReference as a String. The returned string diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java index 110504f5972..9c33180ee9b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java @@ -37,7 +37,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ThreadGroupReference extends ObjectReference { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java index 2e09ec8c96b..ab537ee3f38 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java @@ -36,7 +36,6 @@ import java.util.List; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface ThreadReference extends ObjectReference { /** Thread status is unknown */ public final int THREAD_STATUS_UNKNOWN =-1; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java index 852d714ce71..41b61fcba80 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Type.java @@ -127,7 +127,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface Type extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java index fa36d7bc978..5e077eaaa52 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java @@ -44,7 +44,6 @@ package com.sun.jdi; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface TypeComponent extends Mirror, Accessible { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java index 49f1c8860a3..0366425f66e 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Jim Holmlund * @since 1.5 */ -@jdk.Exported public class VMCannotBeModifiedException extends UnsupportedOperationException { private static final long serialVersionUID = -4063879815130164009L; public VMCannotBeModifiedException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java index faeab609572..f6805f01c8a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java @@ -33,7 +33,6 @@ package com.sun.jdi; * @author Robert Field * @since 1.3 */ -@jdk.Exported public class VMDisconnectedException extends RuntimeException { private static final long serialVersionUID = 2892975269768351637L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java index b05a9aad48e..ff0c3db5213 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java @@ -33,7 +33,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class VMMismatchException extends RuntimeException { private static final long serialVersionUID = 289169358790459564L; public VMMismatchException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java index cc64d929eda..2834d3403c3 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class VMOutOfMemoryException extends RuntimeException { private static final long serialVersionUID = 71504228548910686L; public VMOutOfMemoryException() { diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java index 01d869b2ce3..75e5e410fa7 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Value.java @@ -168,7 +168,6 @@ package com.sun.jdi; * @since 1.3 */ -@jdk.Exported public interface Value extends Mirror { /** * Returns the run-time type of this value. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java index 0571a27d311..c54cc16b992 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java @@ -70,7 +70,6 @@ import java.util.Map; * @author James McIlree * @since 1.3 */ -@jdk.Exported public interface VirtualMachine extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java index dbde25bd19b..5a6fd8b596c 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java @@ -275,7 +275,6 @@ import java.io.IOException; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface VirtualMachineManager { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java index 9a9ee468a3c..460c452a4e4 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidType.java @@ -35,6 +35,5 @@ package com.sun.jdi; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface VoidType extends Type { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java index f3fb87e2ce3..6a60cb82978 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/VoidValue.java @@ -32,7 +32,6 @@ package com.sun.jdi; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface VoidValue extends Value { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java index a4409c6ded4..ccb11c2b765 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java @@ -35,7 +35,6 @@ import java.io.IOException; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface AttachingConnector extends Connector { /** * Attaches to a running application and returns a diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java index 52aebbff5bf..a2b4b386b0a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java @@ -45,7 +45,6 @@ import java.io.Serializable; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface Connector { /** * Returns a short identifier for the connector. Connector implementors @@ -92,7 +91,6 @@ public interface Connector { * {@link Connector.IntegerArgument}, * or {@link Connector.SelectedArgument}. */ - @jdk.Exported public interface Argument extends Serializable { /** * Returns a short, unique identifier for the argument. @@ -158,7 +156,6 @@ public interface Connector { * whose value is Boolean. Boolean values are represented * by the localized versions of the strings "true" and "false". */ - @jdk.Exported public interface BooleanArgument extends Argument { /** * Sets the value of the argument. @@ -199,7 +196,6 @@ public interface Connector { * whose value is an integer. Integer values are represented * by their corresponding strings. */ - @jdk.Exported public interface IntegerArgument extends Argument { /** * Sets the value of the argument. @@ -261,7 +257,6 @@ public interface Connector { * Specification for and value of a Connector argument, * whose value is a String. */ - @jdk.Exported public interface StringArgument extends Argument { /** * Performs basic sanity check of argument. @@ -274,7 +269,6 @@ public interface Connector { * Specification for and value of a Connector argument, * whose value is a String selected from a list of choices. */ - @jdk.Exported public interface SelectedArgument extends Argument { /** * Return the possible values for the argument diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java index b7f57c093ec..d122fa2b84b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java @@ -36,7 +36,6 @@ import java.util.Collections; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class IllegalConnectorArgumentsException extends Exception { private static final long serialVersionUID = -3042212603611350941L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java index af801e961ee..2ad3ba6abfb 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java @@ -35,7 +35,6 @@ import java.io.IOException; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface LaunchingConnector extends Connector { /** * Launches an application and connects to its VM. Properties diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java index 1048201d12b..0057299168f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java @@ -35,7 +35,6 @@ import com.sun.jdi.VirtualMachine; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface ListeningConnector extends Connector { /** * Indicates whether this listening connector supports multiple diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java index 102d64cd1c7..d185132ebfd 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java @@ -42,7 +42,6 @@ import com.sun.jdi.connect.spi.TransportService; // for javadoc * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public interface Transport { /** * Returns a short identifier for the transport. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java index 2a13567af76..d2a8e50089f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java @@ -54,7 +54,6 @@ package com.sun.jdi.connect; * * @since 1.5 */ -@jdk.Exported public class TransportTimeoutException extends java.io.IOException { private static final long serialVersionUID = 4107035242623365074L; /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java index 04c06292180..0296e78a63f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java @@ -34,7 +34,6 @@ package com.sun.jdi.connect; * @author Gordon Hirsch * @since 1.3 */ -@jdk.Exported public class VMStartException extends Exception { private static final long serialVersionUID = 6408644824640801020L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java index c444b75137a..c7a240ef47d 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java @@ -35,5 +35,4 @@ * extension. */ -@jdk.Exported package com.sun.jdi.connect; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java index 009128b7214..88fc547d882 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java @@ -45,7 +45,6 @@ package com.sun.jdi.connect.spi; * * @since 1.5 */ -@jdk.Exported public class ClosedConnectionException extends java.io.IOException { private static final long serialVersionUID = 3877032124297204774L; /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java index 31e1ca5870f..2067d714c4b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java @@ -56,7 +56,6 @@ import java.io.IOException; * @since 1.5 */ -@jdk.Exported public abstract class Connection { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java index f51c762911a..61eba8880cc 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java @@ -77,7 +77,6 @@ import com.sun.jdi.connect.TransportTimeoutException; * @since 1.5 */ -@jdk.Exported public abstract class TransportService { /** @@ -97,7 +96,6 @@ public abstract class TransportService { /** * The transport service capabilities. */ - @jdk.Exported public static abstract class Capabilities { /** @@ -231,7 +229,6 @@ public abstract class TransportService { * #stopListening stopListening} to stop the transport * service from listening on an address. */ - @jdk.Exported public static abstract class ListenKey { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java index 956e28dcff8..ad8a359817f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java @@ -29,5 +29,4 @@ * implementations. */ -@jdk.Exported package com.sun.jdi.connect.spi; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java index b04d4f71ac5..b56f0ca9e33 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java @@ -37,6 +37,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface AccessWatchpointEvent extends WatchpointEvent { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java index 565f4f05dd4..131a031ef72 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/BreakpointEvent.java @@ -47,6 +47,5 @@ import java.util.List; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface BreakpointEvent extends LocatableEvent { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java index 2f0bf5a353c..4812994a1b2 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassPrepareEvent.java @@ -39,7 +39,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ClassPrepareEvent extends Event { /** * Returns the thread in which this event has occurred. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java index b900e6ad9df..357619563c8 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ClassUnloadEvent.java @@ -39,7 +39,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ClassUnloadEvent extends Event { /** * Returns the name of the class that has been unloaded. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java index 8e8185cf22a..b6f9653ef29 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/Event.java @@ -43,7 +43,6 @@ import com.sun.jdi.request.EventRequest; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface Event extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java index e16ccc5b2f6..0028d850e0b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventIterator.java @@ -40,7 +40,6 @@ import java.util.Iterator; * @since 1.3 */ -@jdk.Exported public interface EventIterator extends Iterator { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java index e7912ba68a4..f4c313abb31 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventQueue.java @@ -57,7 +57,6 @@ import com.sun.jdi.*; * @since 1.3 */ -@jdk.Exported public interface EventQueue extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java index 640dacd0113..1acef1ef0d2 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/EventSet.java @@ -126,7 +126,6 @@ import java.util.Set; * @since 1.3 */ -@jdk.Exported public interface EventSet extends Mirror, Set { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java index 91ed8e4a338..ba887e56cff 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ExceptionEvent.java @@ -44,7 +44,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ExceptionEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java index ab4d7f587c9..489e6117a22 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/LocatableEvent.java @@ -36,7 +36,6 @@ import java.util.List; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface LocatableEvent extends Event, Locatable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java index 29e4df6eb6f..29216ed5d28 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodEntryEvent.java @@ -43,7 +43,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface MethodEntryEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java index 6c7ad305b2a..67ef5287827 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MethodExitEvent.java @@ -40,7 +40,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface MethodExitEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java index 965a6cd932a..b35a9f74875 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java @@ -38,7 +38,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ModificationWatchpointEvent extends WatchpointEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java index 8e7cbaac8ae..e3b3a8f76ed 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java @@ -39,7 +39,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorContendedEnterEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java index 8b4ca48a917..774e1b7732a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java @@ -38,7 +38,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorContendedEnteredEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java index 9a064356ba5..2e5c63ffb40 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitEvent.java @@ -37,7 +37,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorWaitEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java index f29bed152d9..93917b58f5f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java @@ -37,7 +37,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorWaitedEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java index 279078751f8..269ed38ce9a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/StepEvent.java @@ -46,6 +46,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface StepEvent extends LocatableEvent { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java index cd233808691..1277172c962 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadDeathEvent.java @@ -45,7 +45,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ThreadDeathEvent extends Event { /** * Returns the thread which is terminating. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java index 01e9e630e4d..e5fa0d25634 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/ThreadStartEvent.java @@ -52,7 +52,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ThreadStartEvent extends Event { /** * Returns the thread which has started. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java index c96aa12ff79..21e0107df2e 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDeathEvent.java @@ -68,6 +68,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface VMDeathEvent extends Event { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java index 82c49e2c8f7..a2cf66ea537 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMDisconnectEvent.java @@ -52,6 +52,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface VMDisconnectEvent extends Event { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java index 586526ab713..37693ad7587 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/VMStartEvent.java @@ -43,7 +43,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface VMStartEvent extends Event { /** * Returns the initial thread of the VM which has started. diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java index 0246bff4d48..4573407580f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/WatchpointEvent.java @@ -37,7 +37,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface WatchpointEvent extends LocatableEvent { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java index fa9afe3346a..921df07a72d 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java @@ -43,5 +43,4 @@ * extension. */ -@jdk.Exported package com.sun.jdi.event; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java index 00f422fd702..3b34bc24182 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java @@ -44,5 +44,4 @@ * extension. */ -@jdk.Exported package com.sun.jdi; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java index 9b6e71b8680..091cf44dccb 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java @@ -55,6 +55,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface AccessWatchpointRequest extends WatchpointRequest { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java index c6d937ed401..259aa547705 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/BreakpointRequest.java @@ -46,7 +46,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface BreakpointRequest extends EventRequest, Locatable { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java index 4bd1b787e3a..efaf237c7d0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassPrepareRequest.java @@ -47,7 +47,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ClassPrepareRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java index 4335c03029d..2f2758e5108 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ClassUnloadRequest.java @@ -46,7 +46,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ClassUnloadRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java index 3412f23b59a..fa8c0783fb8 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/DuplicateRequestException.java @@ -31,7 +31,6 @@ package com.sun.jdi.request; * @author Robert Field * @since 1.3 */ -@jdk.Exported public class DuplicateRequestException extends RuntimeException { private static final long serialVersionUID = -3719784920313411060L; diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java index 137fdbb1c3f..062fc53fe34 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequest.java @@ -78,7 +78,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface EventRequest extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java index e3b421ab897..cfd53b7762f 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java @@ -44,7 +44,6 @@ import java.util.List; * @since 1.3 */ -@jdk.Exported public interface EventRequestManager extends Mirror { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java index 8de652fa794..5dad44e466b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ExceptionRequest.java @@ -43,7 +43,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ExceptionRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java index 6faab81d472..8bcd93e0a0b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/InvalidRequestStateException.java @@ -35,7 +35,6 @@ package com.sun.jdi.request; * @author Robert Field * @since 1.3 */ -@jdk.Exported public class InvalidRequestStateException extends RuntimeException { private static final long serialVersionUID = -3774632428543322148L; public InvalidRequestStateException() diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java index c31a1e7eefb..8636b108a79 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodEntryRequest.java @@ -44,7 +44,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface MethodEntryRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java index 8c64b9f36a1..f8a852a13f0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MethodExitRequest.java @@ -44,7 +44,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface MethodExitRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java index 994658485d6..29247dfed23 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java @@ -55,6 +55,5 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ModificationWatchpointRequest extends WatchpointRequest { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java index 56c462592b0..2422dad489a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java @@ -45,7 +45,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorContendedEnterRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java index cc36ea25dde..ad617722102 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java @@ -45,7 +45,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorContendedEnteredRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java index 9cb162bd61e..81433ca6242 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitRequest.java @@ -45,7 +45,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorWaitRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java index 6cc41fb4598..1b278ef9300 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java @@ -45,7 +45,6 @@ import com.sun.jdi.*; * @author Swamy Venkataramanappa * @since 1.6 */ -@jdk.Exported public interface MonitorWaitedRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java index abcb249b71d..df3c899f2c0 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/StepRequest.java @@ -43,7 +43,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface StepRequest extends EventRequest { /** Step into any newly pushed frames */ diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java index 916fff45bc7..f39eb3e7903 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java @@ -44,7 +44,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ThreadDeathRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java index c34d1710b68..0ee00a0201a 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java @@ -44,7 +44,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface ThreadStartRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java index 69a767fa18f..4aadcc9d827 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/VMDeathRequest.java @@ -56,7 +56,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.4 */ -@jdk.Exported public interface VMDeathRequest extends EventRequest { } diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java index 0b0de7e3592..9fb63ca117b 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/WatchpointRequest.java @@ -38,7 +38,6 @@ import com.sun.jdi.*; * @author Robert Field * @since 1.3 */ -@jdk.Exported public interface WatchpointRequest extends EventRequest { /** diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java index add151ddce0..1b430cae426 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java @@ -42,5 +42,4 @@ * extension. */ -@jdk.Exported package com.sun.jdi.request; diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java index 8396a850202..20874867f76 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java @@ -82,7 +82,6 @@ import com.sun.management.internal.GarbageCollectionNotifInfoCompositeData; * **/ -@jdk.Exported public class GarbageCollectionNotificationInfo implements CompositeDataView { private final String gcName; diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java index 4963eac61c4..0ee508d536b 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectorMXBean.java @@ -37,7 +37,6 @@ import javax.management.openmbean.CompositeType; * @author Mandy Chung * @since 1.5 */ -@jdk.Exported public interface GarbageCollectorMXBean extends java.lang.management.GarbageCollectorMXBean { diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java b/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java index f256b086a88..ffb25e40670 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java @@ -63,7 +63,6 @@ import com.sun.management.internal.GcInfoBuilder; * @author Mandy Chung * @since 1.5 */ -@jdk.Exported public class GcInfo implements CompositeData, CompositeDataView { private final long index; private final long startTime; diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java index 1d64ae0b452..40d79a2800c 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java @@ -47,7 +47,6 @@ import java.lang.management.PlatformManagedObject; * * @see java.lang.management.ManagementFactory#getPlatformMXBeans(Class) */ -@jdk.Exported public interface HotSpotDiagnosticMXBean extends PlatformManagedObject { /** * Dumps the heap to the {@code outputFile} file in the same diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java index edee07f1d21..feb8e9481c6 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java @@ -39,7 +39,6 @@ package com.sun.management; * @author Mandy Chung * @since 1.5 */ -@jdk.Exported public interface OperatingSystemMXBean extends java.lang.management.OperatingSystemMXBean { diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java index 4801bbadebf..c45e49ef5f8 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java @@ -38,7 +38,6 @@ import java.util.Map; * @since 6u25 */ -@jdk.Exported public interface ThreadMXBean extends java.lang.management.ThreadMXBean { /** * Returns the total CPU time for each thread whose ID is diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java b/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java index f094f5cb891..d0b64f01574 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java @@ -32,7 +32,6 @@ package com.sun.management; * @author Mandy Chung * @since 1.5 */ -@jdk.Exported public interface UnixOperatingSystemMXBean extends com.sun.management.OperatingSystemMXBean { diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java b/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java index bebe1974010..4d9290035ef 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java @@ -52,7 +52,6 @@ import javax.management.openmbean.CompositeData; * @author Mandy Chung * @since 1.6 */ -@jdk.Exported public class VMOption { private String name; private String value; @@ -65,7 +64,6 @@ public class VMOption { * * @since 1.6 */ - @jdk.Exported public enum Origin { /** * The VM option has not been set and its value diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java index 75808f5c96f..92b200f19b4 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java @@ -40,5 +40,4 @@ * @since 1.5 */ -@jdk.Exported package com.sun.management; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java index 498897f2d10..5cf4f80ab35 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java @@ -39,7 +39,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public class AbstractNotificationHandler implements NotificationHandler { diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java index 9d48b1f311f..79170ddf831 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java @@ -51,7 +51,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public class Association { private final int associationID; private final int maxInStreams; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java index 7aefc787eb6..6799f3f6418 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java @@ -29,7 +29,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public abstract class AssociationChangeNotification implements Notification { @@ -38,7 +37,6 @@ public abstract class AssociationChangeNotification * * @since 1.7 */ - @jdk.Exported public enum AssocChangeEvent { /** diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java index b884f823ba9..c4ca0a3de0d 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/HandlerResult.java @@ -34,7 +34,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public enum HandlerResult { /** * Try to receieve another message or notification. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java index 7665817791e..a007c9ecebd 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalReceiveException.java @@ -31,7 +31,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public class IllegalReceiveException extends IllegalStateException { private static final long serialVersionUID = 2296619040988576224L; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java index 5ba86161ab2..3d4a3de5fbf 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/IllegalUnbindException.java @@ -31,7 +31,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public class IllegalUnbindException extends IllegalStateException { private static final long serialVersionUID = -310540883995532224L; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java index 0c0c93c3f4b..9c0437228dd 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/InvalidStreamException.java @@ -30,7 +30,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public class InvalidStreamException extends IllegalArgumentException { private static final long serialVersionUID = -9172703378046665558L; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java index e3208f2b9f9..8fdd4e31bd9 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/MessageInfo.java @@ -56,7 +56,6 @@ import java.net.SocketAddress; * * @since 1.7 */ -@jdk.Exported public abstract class MessageInfo { /** * Initializes a new instance of this class. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java index 7b15b2301fa..e71b88e3608 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/Notification.java @@ -37,7 +37,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public interface Notification { /** * Returns the association that this notification is applicable to. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java index 27b357fc27b..9e5f239f297 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java @@ -49,7 +49,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public interface NotificationHandler { /** * Invoked when a notification is received from the SCTP stack. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java index 4eab3cb1e33..f6f895ebc58 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java @@ -32,7 +32,6 @@ import java.net.SocketAddress; * * @since 1.7 */ -@jdk.Exported public abstract class PeerAddressChangeNotification implements Notification { @@ -47,7 +46,6 @@ public abstract class PeerAddressChangeNotification * * @since 1.7 */ - @jdk.Exported public enum AddressChangeEvent { /** * This address is now reachable. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java index 065b13036e5..c70433277a8 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java @@ -134,7 +134,6 @@ import java.nio.channels.SelectionKey; * * @since 1.7 */ -@jdk.Exported public abstract class SctpChannel extends AbstractSelectableChannel { diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java index aa32a7468a2..529414389e1 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpMultiChannel.java @@ -134,7 +134,6 @@ import java.nio.channels.SelectionKey; * * @since 1.7 */ -@jdk.Exported public abstract class SctpMultiChannel extends AbstractSelectableChannel { diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java index 0e9b9c35f68..4a2ced93462 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpServerChannel.java @@ -68,7 +68,6 @@ import java.nio.channels.spi.AbstractSelectableChannel; * * @since 1.7 */ -@jdk.Exported public abstract class SctpServerChannel extends AbstractSelectableChannel { diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java index 72c92f53773..2b4d0abd079 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpSocketOption.java @@ -35,5 +35,4 @@ import java.net.SocketOption; * * @see SctpStandardSocketOptions */ -@jdk.Exported public interface SctpSocketOption extends SocketOption { } diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java index 75e5c0c05ea..27f175c1d98 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java @@ -34,7 +34,6 @@ import sun.nio.ch.sctp.SctpStdSocketOption; * * @since 1.7 */ -@jdk.Exported public class SctpStandardSocketOptions { private SctpStandardSocketOptions() {} /** @@ -316,7 +315,6 @@ public class SctpStandardSocketOptions { * * @since 1.7 */ - @jdk.Exported public static class InitMaxStreams { private int maxInStreams; private int maxOutStreams; diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java index d69a666b907..22abe888612 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SendFailedNotification.java @@ -37,7 +37,6 @@ import java.net.SocketAddress; * * @since 1.7 */ -@jdk.Exported public abstract class SendFailedNotification implements Notification { /** * Initializes a new instance of this class. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java index 90f66b92c2e..2a8d7ba1c43 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/ShutdownNotification.java @@ -32,7 +32,6 @@ package com.sun.nio.sctp; * * @since 1.7 */ -@jdk.Exported public abstract class ShutdownNotification implements Notification { /** * Initializes a new instance of this class. diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java index ac9cca923db..0cf19db8ee9 100644 --- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java +++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java @@ -72,5 +72,4 @@ * @since 1.7 */ -@jdk.Exported package com.sun.nio.sctp; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java index 6a324eeaccc..6af39422d5f 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/LdapPrincipal.java @@ -45,7 +45,6 @@ import javax.naming.ldap.LdapName; * * @since 1.6 */ -@jdk.Exported public final class LdapPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = 6820120005580754861L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java index 995732efa16..2b15a509e4c 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTDomainPrincipal.java @@ -45,7 +45,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTDomainPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = -4408637351440771220L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java index eca81587468..480e400ceb1 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTNumericCredential.java @@ -30,7 +30,6 @@ package com.sun.security.auth; * and provides a mechanism to do same-process security impersonation. */ -@jdk.Exported public class NTNumericCredential { private long impersonationToken; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java index a304eeb148d..602e817ea72 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSid.java @@ -47,7 +47,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTSid implements Principal, java.io.Serializable { private static final long serialVersionUID = 4412290580770249885L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java index 0911f797efe..2b033bbbc66 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java @@ -43,7 +43,6 @@ package com.sun.security.auth; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTSidDomainPrincipal extends NTSid { private static final long serialVersionUID = 5247810785821650912L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java index 9bdc87b9dc5..d63451e992a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java @@ -40,7 +40,6 @@ package com.sun.security.auth; * @see javax.security.auth.Subject * @see com.sun.security.auth.NTSid */ -@jdk.Exported public class NTSidGroupPrincipal extends NTSid { private static final long serialVersionUID = -1373347438636198229L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java index 1d33ee3909a..7a482a70c9a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java @@ -39,7 +39,6 @@ package com.sun.security.auth; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTSidPrimaryGroupPrincipal extends NTSid { private static final long serialVersionUID = 8011978367305190527L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java index c95d82a4d0a..b2e583d816c 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTSidUserPrincipal.java @@ -39,7 +39,6 @@ package com.sun.security.auth; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTSidUserPrincipal extends NTSid { private static final long serialVersionUID = -5573239889517749525L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java index 1005793f737..687682b56e1 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/NTUserPrincipal.java @@ -41,7 +41,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class NTUserPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = -8737649811939033735L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java index e61e821eca0..38a9709b5e1 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java @@ -215,7 +215,6 @@ import javax.security.auth.Subject; * @see java.security.ProtectionDomain * @see java.security.Security security properties */ -@jdk.Exported(false) @Deprecated public class PolicyFile extends javax.security.auth.Policy { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java index bb0aab1f2f2..db90f097f1a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PrincipalComparator.java @@ -50,7 +50,6 @@ package com.sun.security.auth; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public interface PrincipalComparator { /** * Check if the specified {@code Subject} is implied by diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java index 377e6165fcd..983e987cfc7 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java @@ -45,7 +45,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported(false) @Deprecated public class SolarisNumericGroupPrincipal implements Principal, diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java index 5497856f28a..506852619bc 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java @@ -44,7 +44,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported(false) @Deprecated public class SolarisNumericUserPrincipal implements Principal, diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java index 4aef765e813..3350e08e160 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java @@ -44,7 +44,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported(false) @Deprecated public class SolarisPrincipal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java index 4a96480db01..f71aa128c95 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java @@ -41,7 +41,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class UnixNumericGroupPrincipal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java index cb252a8966e..e07cb8ad39f 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java @@ -41,7 +41,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class UnixNumericUserPrincipal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java index 9694bc7a443..1215015330a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UnixPrincipal.java @@ -41,7 +41,6 @@ import java.security.Principal; * @see java.security.Principal * @see javax.security.auth.Subject */ -@jdk.Exported public class UnixPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = -2951667807323493631L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java index f4e7555ab1a..04b133e4004 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/UserPrincipal.java @@ -42,7 +42,6 @@ import java.security.Principal; * * @since 1.6 */ -@jdk.Exported public final class UserPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = 892106070870210969L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java index 52fdcf868c9..736309fdbea 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java @@ -49,7 +49,6 @@ import sun.security.x509.X500Name; * class. * @see javax.security.auth.x500.X500Principal */ -@jdk.Exported(false) @Deprecated public class X500Principal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java index 4d6f7b68ab1..9170f75bdd6 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java @@ -46,7 +46,6 @@ import sun.security.util.ConsoleCallbackHandler; * @see javax.security.auth.callback */ -@jdk.Exported public class TextCallbackHandler implements CallbackHandler { private final CallbackHandler consoleHandler; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java index 61d65688798..8786680ce4a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/callback/package-info.java @@ -23,5 +23,4 @@ * questions. */ -@jdk.Exported package com.sun.security.auth.callback; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java index 53058177ac2..3e6dc7da579 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/ConfigFile.java @@ -83,7 +83,6 @@ import java.net.URI; * @see javax.security.auth.login.LoginContext * @see java.security.Security security properties */ -@jdk.Exported public class ConfigFile extends Configuration { private final sun.security.provider.ConfigFile.Spi spi; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java index a0b207c5578..45a01ea28c3 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/login/package-info.java @@ -23,5 +23,4 @@ * questions. */ -@jdk.Exported package com.sun.security.auth.login; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java index bc7a1a911cd..1642e435934 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java @@ -151,7 +151,6 @@ import com.sun.security.auth.UnixNumericGroupPrincipal; * * */ -@jdk.Exported public class JndiLoginModule implements LoginModule { private static final ResourceBundle rb = AccessController.doPrivileged( diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java index ece0d3f8afb..92ec5bcda57 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java @@ -110,7 +110,6 @@ import sun.security.util.Password; * * */ -@jdk.Exported public class KeyStoreLoginModule implements LoginModule { private static final ResourceBundle rb = AccessController.doPrivileged( diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java index b4360c79d61..8f0943620f6 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java @@ -367,7 +367,6 @@ import sun.security.util.HexDumpEncoder; * @author Ram Marti */ -@jdk.Exported public class Krb5LoginModule implements LoginModule { // initial state diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java index 167530a4b79..7c2da1847a4 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java @@ -303,7 +303,6 @@ import com.sun.security.auth.UserPrincipal; * * @since 1.6 */ -@jdk.Exported public class LdapLoginModule implements LoginModule { // Use the default classloader for this class to load the prompt strings. diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java index 98d1f1319d9..c251d54eb58 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java @@ -57,7 +57,6 @@ import com.sun.security.auth.NTNumericCredential; * * @see javax.security.auth.spi.LoginModule */ -@jdk.Exported public class NTLoginModule implements LoginModule { private NTSystem ntSystem; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java index d15636955a6..9dbd69325fc 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java @@ -30,7 +30,6 @@ package com.sun.security.auth.module; * security information for the current user. * */ -@jdk.Exported public class NTSystem { private native void getCurrent(boolean debug); diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java index 9b5adb0c3cf..f5666ff9b5e 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java @@ -52,7 +52,6 @@ import com.sun.security.auth.SolarisNumericGroupPrincipal; * UnixLoginModule. * */ -@jdk.Exported(false) @Deprecated public class SolarisLoginModule implements LoginModule { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java index 98f6f4c70a0..ea4842aa10a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java @@ -31,7 +31,6 @@ package com.sun.security.auth.module; * * @deprecated replaced by {@link UnixSystem}. */ -@jdk.Exported(false) @Deprecated public class SolarisSystem { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java index 704b11dc33c..a2acf7a9742 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java @@ -47,7 +47,6 @@ import com.sun.security.auth.UnixNumericGroupPrincipal; * debug messages will be output to the output stream, System.out. * */ -@jdk.Exported public class UnixLoginModule implements LoginModule { // initial state diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java index 43f93f78e82..46b1c946c51 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java @@ -29,7 +29,6 @@ package com.sun.security.auth.module; * This class implementation retrieves and makes available Unix * UID/GID/groups information for the current user. */ -@jdk.Exported public class UnixSystem { private native void getUnixInfo(); diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java index 21569670ffe..9056324f49a 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/package-info.java @@ -23,5 +23,4 @@ * questions. */ -@jdk.Exported package com.sun.security.auth.module; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java index 3fe7e206fa7..c0397bfd2f1 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/package-info.java @@ -23,5 +23,4 @@ * questions. */ -@jdk.Exported package com.sun.security.auth; diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java index 5ec9e615ebb..eabaac94ad5 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java @@ -28,7 +28,6 @@ package com.sun.security.jgss; /** * Kerberos 5 AuthorizationData entry. */ -@jdk.Exported public final class AuthorizationDataEntry { private final int type; diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java index 32e6b0412e2..3496a5f0c4c 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSContext.java @@ -34,7 +34,6 @@ import sun.security.krb5.internal.AuthorizationData; * functionalities not defined by {@code org.ietf.jgss.GSSContext}, * such as querying context-specific attributes. */ -@jdk.Exported public interface ExtendedGSSContext extends GSSContext { // The impl is almost identical to GSSContextImpl with only 2 differences: diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java index 56fe1030744..0e9582769d6 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java @@ -33,7 +33,6 @@ import sun.security.jgss.GSSCredentialImpl; * functionalities not defined by {@code org.ietf.jgss.GSSCredential}. * @since 1.8 */ -@jdk.Exported public interface ExtendedGSSCredential extends GSSCredential { static class ExtendedGSSCredentialImpl extends GSSCredentialImpl diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java index 2358c5829b7..e1f63c28ab5 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java @@ -33,7 +33,6 @@ import org.ietf.jgss.GSSCredential; * GSS-API Utilities for using in conjunction with Sun Microsystem's * implementation of Java GSS-API. */ -@jdk.Exported public class GSSUtil { /** diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java index f8e850c0ee0..618d3c74752 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireSecContextPermission.java @@ -35,7 +35,6 @@ import java.security.BasicPermission; * *

The target name is the {@link InquireType} allowed. */ -@jdk.Exported public final class InquireSecContextPermission extends BasicPermission { private static final long serialVersionUID = -7131173349668647297L; diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java index 09d407aca6f..5ba482dbd6e 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/InquireType.java @@ -29,7 +29,6 @@ package com.sun.security.jgss; * Attribute types that can be specified as an argument of * {@link com.sun.security.jgss.ExtendedGSSContext#inquireSecContext} */ -@jdk.Exported public enum InquireType { /** * Attribute type for retrieving the session key of an established diff --git a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java index b1c82d77387..5bd43c874a3 100644 --- a/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java +++ b/jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java @@ -23,5 +23,4 @@ * questions. */ -@jdk.Exported package com.sun.security.jgss; From 6d1772a3563eca5889daff762756d89ac8308f83 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 8 Jan 2016 15:05:43 +0100 Subject: [PATCH 37/37] 8146091: Configure fails to configure icecc on OEL Reviewed-by: ihse --- common/autoconf/build-performance.m4 | 49 +++++++++++---- common/autoconf/generated-configure.sh | 84 +++++++++++++++++++++----- 2 files changed, 108 insertions(+), 25 deletions(-) diff --git a/common/autoconf/build-performance.m4 b/common/autoconf/build-performance.m4 index 5c2f1b62642..463498f8471 100644 --- a/common/autoconf/build-performance.m4 +++ b/common/autoconf/build-performance.m4 @@ -251,6 +251,24 @@ AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], fi ]) +################################################################################ +# +# Runs icecc-create-env once and prints the error if it fails +# +# $1: arguments to icecc-create-env +# $2: log file +# +AC_DEFUN([BPERF_RUN_ICECC_CREATE_ENV], +[ + cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ + && ${ICECC_CREATE_ENV} $1 > $2 2>&1 + if test "$?" != "0"; then + AC_MSG_NOTICE([icecc-create-env output:]) + cat $2 + AC_MSG_ERROR([Failed to create icecc compiler environment]) + fi +]) + ################################################################################ # # Optionally enable distributed compilation of native code using icecc/icecream @@ -271,16 +289,18 @@ AC_DEFUN([BPERF_SETUP_ICECC], # be sent to the other hosts in the icecream cluster. icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log" ${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc - AC_MSG_CHECKING([for icecc build environment for target compiler]) + # Older versions of icecc does not have the --gcc parameter + if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then + icecc_gcc_arg="--gcc" + fi if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --gcc ${CC} ${CXX} > ${icecc_create_env_log} + BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${CC} ${CXX}], \ + ${icecc_create_env_log}) elif test "x$TOOLCHAIN_TYPE" = "xclang"; then # For clang, the icecc compilerwrapper is needed. It usually resides next # to icecc-create-env. BASIC_REQUIRE_PROGS(ICECC_WRAPPER, compilerwrapper) - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} + BPERF_RUN_ICECC_CREATE_ENV([--clang ${CC} ${ICECC_WRAPPER}], ${icecc_create_env_log}) else AC_MSG_ERROR([Can only create icecc compiler packages for toolchain types gcc and clang]) fi @@ -289,24 +309,31 @@ AC_DEFUN([BPERF_SETUP_ICECC], # to find it. ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" + if test ! -f ${ICECC_ENV_BUNDLE}; then + AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}]) + fi + AC_MSG_CHECKING([for icecc build environment for target compiler]) AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}" if test "x${COMPILE_TYPE}" = "xcross"; then # If cross compiling, create a separate env package for the build compiler - AC_MSG_CHECKING([for icecc build environment for build compiler]) # Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail. + icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log" if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --gcc ${BUILD_CC} ${BUILD_CXX} > ${icecc_create_env_log} + BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX}], \ + ${icecc_create_env_log_build}) elif test "x${BUILD_CC##*/}" = "xclang"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} + BPERF_RUN_ICECC_CREATE_ENV([--clang ${BUILD_CC} ${ICECC_WRAPPER}], ${icecc_create_env_log_build}) else AC_MSG_ERROR([Cannot create icecc compiler package for ${BUILD_CC}]) fi - ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" + ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" + if test ! -f ${ICECC_ENV_BUNDLE}; then + AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}]) + fi + AC_MSG_CHECKING([for icecc build environment for build compiler]) AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \ ICECC_CXX=${BUILD_CXX} ${ICECC_CMD}" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 696006c418e..de0cce655ce 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3792,6 +3792,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +################################################################################ +# +# Runs icecc-create-env once and prints the error if it fails +# +# $1: arguments to icecc-create-env +# $2: log file +# + + ################################################################################ # # Optionally enable distributed compilation of native code using icecc/icecream @@ -4801,7 +4810,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1452247834 +DATE_WHEN_GENERATED=1452261921 ############################################################################### # @@ -59582,11 +59591,23 @@ $as_echo "$tool_specified" >&6; } # be sent to the other hosts in the icecream cluster. icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log" ${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for target compiler" >&5 -$as_echo_n "checking for icecc build environment for target compiler... " >&6; } + # Older versions of icecc does not have the --gcc parameter + if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then + icecc_gcc_arg="--gcc" + fi if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --gcc ${CC} ${CXX} > ${icecc_create_env_log} + + cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ + && ${ICECC_CREATE_ENV} ${icecc_gcc_arg} ${CC} ${CXX} > \ + ${icecc_create_env_log} 2>&1 + if test "$?" != "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5 +$as_echo "$as_me: icecc-create-env output:" >&6;} + cat \ + ${icecc_create_env_log} + as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5 + fi + elif test "x$TOOLCHAIN_TYPE" = "xclang"; then # For clang, the icecc compilerwrapper is needed. It usually resides next # to icecc-create-env. @@ -59794,8 +59815,16 @@ $as_echo "$tool_specified" >&6; } fi - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} + + cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ + && ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} 2>&1 + if test "$?" != "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5 +$as_echo "$as_me: icecc-create-env output:" >&6;} + cat ${icecc_create_env_log} + as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5 + fi + else as_fn_error $? "Can only create icecc compiler packages for toolchain types gcc and clang" "$LINENO" 5 fi @@ -59804,26 +59833,53 @@ $as_echo "$tool_specified" >&6; } # to find it. ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" + if test ! -f ${ICECC_ENV_BUNDLE}; then + as_fn_error $? "icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for target compiler" >&5 +$as_echo_n "checking for icecc build environment for target compiler... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5 $as_echo "${ICECC_ENV_BUNDLE}" >&6; } ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}" if test "x${COMPILE_TYPE}" = "xcross"; then # If cross compiling, create a separate env package for the build compiler - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for build compiler" >&5 -$as_echo_n "checking for icecc build environment for build compiler... " >&6; } # Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail. + icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log" if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --gcc ${BUILD_CC} ${BUILD_CXX} > ${icecc_create_env_log} + + cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ + && ${ICECC_CREATE_ENV} ${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX} > \ + ${icecc_create_env_log_build} 2>&1 + if test "$?" != "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5 +$as_echo "$as_me: icecc-create-env output:" >&6;} + cat \ + ${icecc_create_env_log_build} + as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5 + fi + elif test "x${BUILD_CC##*/}" = "xclang"; then - cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ - && ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} + + cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ + && ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log_build} 2>&1 + if test "$?" != "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5 +$as_echo "$as_me: icecc-create-env output:" >&6;} + cat ${icecc_create_env_log_build} + as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5 + fi + else as_fn_error $? "Cannot create icecc compiler package for ${BUILD_CC}" "$LINENO" 5 fi - ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" + ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" + if test ! -f ${ICECC_ENV_BUNDLE}; then + as_fn_error $? "icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for build compiler" >&5 +$as_echo_n "checking for icecc build environment for build compiler... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5 $as_echo "${ICECC_ENV_BUNDLE}" >&6; } BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \